Moves maps and labels under templates in appdata

isis/CMakeLists.txt

@@ -465,10 +465,10 @@ execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/appdata/templates/kernels)
 execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/appdata/templates/photometry) # *.pvl
 execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/appdata/templates/hidtmgen) # *.pvl
 
-execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/appdata/maps)
+execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/appdata/templates/maps)
 execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/appdata/images/icons)
 execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/appdata/images/targets)
-execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/appdata/labels)
+execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/appdata/templates/labels)
 #execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/appdata/autoreg)
 
 # Create an xml folder in the source directory that we will need later
@@ -614,11 +614,11 @@ add_custom_target(targets ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
 add_dependencies(isis3 targets)
 
 add_custom_target(maps ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
-  ${CMAKE_SOURCE_DIR}/appdata/maps/*.map ${CMAKE_BINARY_DIR}/appdata/maps)
+  ${CMAKE_SOURCE_DIR}/appdata/templates/maps/*.map ${CMAKE_BINARY_DIR}/appdata/templates/maps)
 add_dependencies(isis3 maps)
 
 add_custom_target(labels ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
-  ${CMAKE_SOURCE_DIR}/appdata/labels/*.pft ${CMAKE_BINARY_DIR}/appdata/labels)
+  ${CMAKE_SOURCE_DIR}/appdata/templates/labels/*.pft ${CMAKE_BINARY_DIR}/appdata/templates/labels)
 add_dependencies(isis3 labels)
 
 #add_custom_target(autoreg ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different

isis/appdata/labels/CubeFormatTemplate.pft → isis/appdata/templates/labels/CubeFormatTemplate.pft

@@ -24,7 +24,7 @@ Object = IsisCube
   End_Group
 
   Group = Mapping
-    Isis:PvlTemplate:File = $ISISROOT/appdata/labels/MappingGroupKeywords.pft
+    Isis:PvlTemplate:File = $ISISROOT/appdata/templates/labels/MappingGroupKeywords.pft
   End_Group
 
   Group = AlphaCube

isis/src/base/apps/cam2map/cam2map.xml

@@ -315,8 +315,8 @@
         <brief>
           File containing mapping parameters
         </brief>
-        <defaultPath>$ISISROOT/appdata/maps</defaultPath>
-        <default><item>$ISISROOT/appdata/maps/sinusoidal.map</item></default>
+        <defaultPath>$ISISROOT/appdata/templates/maps</defaultPath>
+        <default><item>$ISISROOT/appdata/templates/maps/sinusoidal.map</item></default>
         <description>
           A file containing the desired output mapping parameters in PVL format. This
           file can be a simple label file, or can be hand produced, or created via

isis/src/base/apps/footprintinit/footprintinit.xml

@@ -368,8 +368,8 @@
         <brief>
           File containing mapping parameters
         </brief>
-        <defaultPath>$ISISROOT/appdata/maps</defaultPath>
-        <default><item>$ISISROOT/appdata/maps/sinusoidal.map</item></default>
+        <defaultPath>$ISISROOT/appdata/templates/maps</defaultPath>
+        <default><item>$ISISROOT/appdata/templates/maps/sinusoidal.map</item></default>
         <description>
           A file containing the desired XY mapping parameters.  This
           file can be a simple label file, hand produced or created via

isis/src/base/apps/map2map/map2map.xml

@@ -167,8 +167,8 @@
         <brief>
           File containing mapping parameters
         </brief>
-        <defaultPath>$ISISROOT/appdata/maps</defaultPath>
-        <default><item>$ISISROOT/appdata/maps/sinusoidal.map</item></default>
+        <defaultPath>$ISISROOT/appdata/templates/maps</defaultPath>
+        <default><item>$ISISROOT/appdata/templates/maps/sinusoidal.map</item></default>
         <description>
           A file containing the desired output mapping parameters in PVL.  This
           file can be a simple label file, hand produced or created via

isis/src/base/apps/maptemplate/maptemplate.xml

@@ -46,7 +46,7 @@
      To convert a raw instrument/camera cube (<def>Level1</def>) to a map projected 
      image (<def>Level2</def>) the user must (1) create a  custom <def>PVL</def> formatted 
      text file, (2) use this <i>maptemplate</i> application to produce one, or (3) use 
-       the automated, projection-specific Map File Template in $ISISROOT/appdata/maps.
+       the automated, projection-specific Map File Template in $ISISROOT/templates/appdata/maps.
      Whichever method that you choose, the Map File Template should contain the necessary 
      keywords to project an image. 
    </p>
@@ -91,7 +91,7 @@
        it requires keywords that are not defined in the program.<br /><br />
      </li>
      <li>
-	 Templates in $ISISROOT/appdata/maps:  the template contains all the 
+	 Templates in $ISISROOT/templates/appdata/maps:  the template contains all the 
        parameters necessary to project an image, and only the Projection name is 
        "uncommented" in the file. This is because some projections only require 
        that you enter a projection name, and the default values are computed for 

isis/src/base/apps/mosrange/mosrange.xml

@@ -137,7 +137,7 @@ End
       <parameter name="MAP">
         <type>filename</type>
         <fileMode>input</fileMode>
-        <defaultPath>$ISISROOT/appdata/maps</defaultPath>
+        <defaultPath>$ISISROOT/appdata/templates/maps</defaultPath>
         <internalDefault>None</internalDefault>
           <filter>*.map *.cub</filter>
         <brief>

isis/src/base/apps/mosrange/tsts/default/Makefile

@@ -11,7 +11,7 @@ include $(ISISROOT)/make/isismake.tsts
 commands:
 	$(LS) $(INPUT)/*.cub > $(OUTPUT)/files.lis;
 	$(APPNAME) FROMLIST=$(OUTPUT)/files.lis \
-	MAP=$(ISISROOT)/appdata/maps/equirectangular.map \
+	MAP=$(ISISROOT)/appdata/templates/maps/equirectangular.map \
 	TO=$(OUTPUT)/mosrange_equi.map PRECISION=4 > /dev/null;
 	/bin/mv $(OUTPUT)/mosrange_equi.map $(OUTPUT)/mosrange_equi.txt
 	$(RM) $(OUTPUT)/files.lis;

isis/src/base/apps/nocam2map/nocam2map.xml

@@ -346,8 +346,8 @@
         <brief>
           File containing mapping parameters
         </brief>
-        <defaultPath>$ISISROOT/appdata/maps</defaultPath>
-        <default><item>$ISISROOT/appdata/maps/sinusoidal.map</item></default>
+        <defaultPath>$ISISROOT/appdata/templates/maps</defaultPath>
+        <default><item>$ISISROOT/appdata/templates/maps/sinusoidal.map</item></default>
         <description>
           A file containing the desired output mapping parameters in
           <def>PVL</def> form.  This file can be a simple hand produced label

isis/src/base/apps/pixel2map/pixel2map.xml

@@ -393,8 +393,8 @@
         <brief>
           File containing mapping parameters
         </brief>
-        <defaultPath>$ISISROOT/appdata/maps</defaultPath>
-        <default><item>$ISISROOT/appdata/maps/sinusoidal.map</item></default>
+        <defaultPath>$ISISROOT/appdata/templates/maps</defaultPath>
+        <default><item>$ISISROOT/appdata/templates/maps/sinusoidal.map</item></default>
         <description>
           A file containing the desired output mapping parameters in PVL.  This
           file can be a simple label file, hand produced, or created via
@@ -843,7 +843,7 @@
       <terminalInterface>
         <commandLine>
           from=C1621694254_1.ir.band248.cub
-          map=/usgs/cpkgs/isis3/data/base/templates/maps/equirectangular.map
+          map=$ISISROOT/appdata/templates/maps/equirectangular.map
           to=default.cub
           lonseam=continue
         </commandLine>
@@ -903,7 +903,7 @@
       <terminalInterface>
         <commandLine>
           from=VIR_IR_1B_1_506266095_refl_1.b75.l1.cub
-          map=/usgs/cpkgs/isis3/data/base/templates/maps/equirectangular.map
+          map=$ISISROOT/appdata/templates/maps/equirectangular.map
           to=dawn_vir_instantaneous_fov.cub
         </commandLine>
         <description>
@@ -957,7 +957,7 @@
       <terminalInterface>
         <commandLine>
           from=VIR_IR_1B_1_506266095_refl_1.b75.l1.cub
-          map=/usgs/cpkgs/isis3/data/base/templates/maps/equirectangular.map
+          map=$ISISROOT/appdata/templates/maps/equirectangular.map
           to=dawn_vir_full_fov.cub
           fovrange=fullexposure
         </commandLine>

isis/src/base/apps/pixel2map/tsts/crismpolyoverlap/Makefile

@@ -5,6 +5,6 @@ include $(ISISROOT)/make/isismake.tsts
 commands:
 	$(APPNAME) from=$(INPUT)/crism.cub \
 	           to=$(OUTPUT)/crismequi.cub \
-	           map=$(ISISROOT)/appdata/maps/equirectangular.map \
+	           map=$(ISISROOT)/appdata/templates/maps/equirectangular.map \
 	           method=wholepixel \
 			   > /dev/null;

isis/src/base/apps/pixel2map/tsts/lonboundary/Makefile

@@ -6,5 +6,5 @@ commands:
 	$(APPNAME) from=$(INPUT)/C1621694254_1.ir.band248.cub \
                to=$(OUTPUT)/C1621694254_1.ir.equi.cub \
 			   lonseam=continue \
-			   map=$(ISISROOT)/appdata/maps/equirectangular.map \
+			   map=$(ISISROOT)/appdata/templates/maps/equirectangular.map \
 			   > /dev/null;

isis/src/base/apps/pixel2map/tsts/pole/Makefile

@@ -5,5 +5,5 @@ include $(ISISROOT)/make/isismake.tsts
 commands:
 	$(APPNAME) from= $(INPUT)/C1596102183_1.ir.cub \
                to=$(OUTPUT)/C1596102183_1.ir.polar.cub \
-			   map=$(ISISROOT)/appdata/maps/polarstereographic.map \
+			   map=$(ISISROOT)/appdata/templates/maps/polarstereographic.map \
 			   > /dev/null;

isis/src/base/apps/pixel2map/tsts/vimshires/Makefile

@@ -5,7 +5,7 @@ include $(ISISROOT)/make/isismake.tsts
 commands:
 	$(APPNAME) from= $(INPUT)/C1716334271_1.irBand248.cub \
 	           to=$(OUTPUT)/C1716334271_1.irBand248.polar.cub \
-	           map=$(ISISROOT)/appdata/maps/polarstereographic.map \
+	           map=$(ISISROOT)/appdata/templates/maps/polarstereographic.map \
 	           pixres=ppd \
 	           res=20 \
 	           > /dev/null;

isis/src/base/apps/ringscam2map/ringscam2map.xml

@@ -13,7 +13,7 @@
     be run on it with shape set to RingPlane prior to <i>ringscam2map</i>.  The 
     <def link="Map Projection">map projection</def> is defined using a <def>PVL</def> file 
     specified with the MAP parameter.  The system default is to use the Planar projection 
-    ($ISISROOT/appdata/maps/planar.map).  To learn more about using map projections in 
+    ($ISISROOT/appdata/templates/maps/planar.map).  To learn more about using map projections in 
     ISIS, refer to the ISIS Workshop 
     <a href="https://isis.astrogeology.usgs.gov/fixit/projects/isis/wiki/Learning_About_Map_Projections">
     "Learning About Map Projections"</a>.
@@ -294,8 +294,8 @@
         <brief>
           File containing mapping parameters
         </brief>
-        <defaultPath>$ISISROOT/appdata/maps</defaultPath>
-        <default><item>$ISISROOT/appdata/maps/planar.map</item></default>
+        <defaultPath>$ISISROOT/appdata/templates/maps</defaultPath>
+        <default><item>$ISISROOT/appdata/templates/maps/planar.map</item></default>
         <description>
           A file containing the desired output mapping parameters in PVL.  This
           file can be a simple label file, hand produced, or created via

isis/src/base/apps/skymap/skymap.xml

@@ -126,8 +126,8 @@
         <brief>
           File containing mapping parameters
         </brief>
-        <defaultPath>$ISISROOT/appdata/maps</defaultPath>
-        <default><item>$ISISROOT/appdata/maps/simplecylindrical.map</item></default>
+        <defaultPath>$ISISROOT/appdata/templates/maps</defaultPath>
+        <default><item>$ISISROOT/appdata/templates/maps/simplecylindrical.map</item></default>
         <description>
           A file containing the desired output mapping parameters in PVL form.  This
           file can be a simple hand produced label file.  It can also be an existing cube label

isis/src/base/objs/Cube/Cube.cpp

@@ -1937,7 +1937,7 @@ namespace Isis {
 
     m_mutex = new QMutex();
     m_formatTemplateFile =
-         new FileName("$ISISROOT/appdata/labels/CubeFormatTemplate.pft");
+         new FileName("$ISISROOT/appdata/templates/labels/CubeFormatTemplate.pft");
 
     initialize();
   }

isis/src/cassini/tsts/vims/Makefile

@@ -99,7 +99,7 @@ commands:
 #  images because the vims camera model finds solution for any lat/lon and the range checking 
 #  was not working correctly.
 	$(CAM2MAP) $(TSTARGS) from=$(INPUT)/C1514302573_1.irBand71.cub to=$(OUTPUT)/C1514302573_1.irBand71.sinu.cub \
-          map=$(ISISROOT)/appdata/maps/sinusoidal.map \
+          map=$(ISISROOT)/appdata/templates/maps/sinusoidal.map \
           pixres=ppd resolution=2 defaultrange=map minlat=-90 maxlat=90 minlon=0 maxlon=360 \
           trim=yes > /dev/null
 

isis/src/control/apps/seedgrid/seedgrid.xml

@@ -96,8 +96,8 @@
         <brief>
           File containing mapping parameters
         </brief>
-        <defaultPath>$ISISROOT/appdata/maps</defaultPath>
-        <default><item>$ISISROOT/appdata/maps/sinusoidal.map</item></default>
+        <defaultPath>$ISISROOT/appdata/templates/maps</defaultPath>
+        <default><item>$ISISROOT/appdata/templates/maps/sinusoidal.map</item></default>
         <description>
           A file containing the mapping parameters in PVL form.  This file can
           be a simple PVL file or an existing cube label that contains a

isis/src/control/objs/ControlNetVersioner/unitTest.cpp

@@ -139,7 +139,7 @@ int main(int argc, char *argv[]) {
 
   cout << endl << "Test reading a random PVL file" << endl << endl;
   try {
-    ControlNetVersioner invalidVersioner("$ISISROOT/appdata/maps/equirectangular.map");
+    ControlNetVersioner invalidVersioner("$ISISROOT/appdata/templates/maps/equirectangular.map");
   }
   catch (IException &e) {
     e.print();

isis/src/mro/apps/hirdrgen/MroHirisePdsRdrEqui.pft

@@ -97,6 +97,6 @@ OBJECT = IMAGE_MAP_PROJECTION
     A_AXIS_RADIUS
     B_AXIS_RADIUS
     C_AXIS_RADIUS
-    Isis:PvlTemplate:File = $ISISROOT/appdata/labels/pdsExportAllMapping.pft
+    Isis:PvlTemplate:File = $ISISROOT/appdata/templates/labels/pdsExportAllMapping.pft
 END_OBJECT = IMAGE_MAP_PROJECTION
 End

isis/src/mro/apps/hirdrgen/MroHirisePdsRdrEquiJP2.pft

@@ -110,6 +110,6 @@ OBJECT = IMAGE_MAP_PROJECTION
     A_AXIS_RADIUS
     B_AXIS_RADIUS
     C_AXIS_RADIUS
-    Isis:PvlTemplate:File = $ISISROOT/appdata/labels/pdsExportAllMapping.pft
+    Isis:PvlTemplate:File = $ISISROOT/appdata/templates/labels/pdsExportAllMapping.pft
 END_OBJECT = IMAGE_MAP_PROJECTION
 End

isis/src/mro/apps/hirdrgen/MroHirisePdsRdrPolar.pft

@@ -81,6 +81,6 @@ OBJECT = IMAGE
 END_OBJECT = IMAGE
 
 OBJECT = IMAGE_MAP_PROJECTION
-    Isis:PvlTemplate:File = $ISISROOT/appdata/labels/pdsExportAllMapping.pft
+    Isis:PvlTemplate:File = $ISISROOT/appdata/templates/labels/pdsExportAllMapping.pft
 END_OBJECT = IMAGE_MAP_PROJECTION
 End

isis/src/mro/apps/hirdrgen/MroHirisePdsRdrPolarJP2.pft

@@ -94,6 +94,6 @@ OBJECT = UNCOMPRESSED_FILE
 END_OBJECT = UNCOMPRESSED_FILE
 
 OBJECT = IMAGE_MAP_PROJECTION
-    Isis:PvlTemplate:File = $ISISROOT/appdata/labels/pdsExportAllMapping.pft
+    Isis:PvlTemplate:File = $ISISROOT/appdata/templates/labels/pdsExportAllMapping.pft
 END_OBJECT = IMAGE_MAP_PROJECTION
 End

isis/src/qisis/objs/MosaicSceneWidget/MosaicSceneWidget.cpp

@@ -342,7 +342,7 @@ namespace Isis {
       return proj->Mapping();
     }
     catch (IException &) {
-      Pvl mappingPvl("$ISISROOT/appdata/maps/equirectangular.map");
+      Pvl mappingPvl("$ISISROOT/appdata/templates/maps/equirectangular.map");
       PvlGroup &mappingGrp = mappingPvl.findGroup("Mapping");
       mappingGrp += PvlKeyword("LatitudeType", "Planetocentric");
       mappingGrp += PvlKeyword("LongitudeDirection", "PositiveEast");
@@ -386,7 +386,7 @@ namespace Isis {
         "scene. Cubes can not be shown in the scene without a projection, so "
         "if one is not selected, a default of Equirectangular will be used. "
         "The selected file should be a map file, examples are available in "
-        "$ISISROOT/appdata/maps."));
+        "$ISISROOT/appdata/templates/maps."));
     m_mapButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     connect(m_mapButton, SIGNAL(clicked()), this, SLOT(configProjectionParameters()));
 
@@ -1151,7 +1151,7 @@ namespace Isis {
         "on creating a custom map file that defines the desired projection, latitude "
         "system, and longitude direction and domain. This program will use the latitude range "
         "and longitude range if they exist in the loaded file. A choice of map templates that can be used as "
-        "a starting point for supported map projections can be found in $ISISROOT/appdata/maps (refer "
+        "a starting point for supported map projections can be found in $ISISROOT/appdata/templates/maps (refer "
         "to maptemplate or mosrange for more details and information on the required parameters "
         "for a projection). The website: "
         "<a href='%1'>%1</a> also provides useful information about map projections.")