Changeset 53

Timestamp:

10/17/07 16:26:15 (11 months ago)

Author:

juan

Message:

Localization changes to include localized labels and to output the city name from the XML file.

Also added javascript cookies to use shortly for the analysis tool.

Files:

• branches/development/atlas.php (modified) (2 diffs)
• branches/development/javascripts/cookie.js (added)
• branches/development/javascripts/ict4dApp.js (modified) (9 diffs)
• branches/development/locale/en_CA.xml (modified) (3 diffs)
• branches/development/map/MapFileConfiguration.inc.php (modified) (2 diffs)
• branches/development/mapTools/ict4dLegend.js (modified) (3 diffs)
• branches/development/mapTools/ict4dQuery.php (modified) (1 diff)
• branches/development/mapTools/insertCityPointData.php (modified) (1 diff)
• branches/development/mapTools/legend.php (modified) (1 diff)
• branches/development/mapTools/mapPrintProduction.inc.php (moved) (moved from branches/development/mapTools/preview.php) (1 diff)
• branches/development/mapTools/mapSelector.js (modified) (3 diffs)
• branches/development/mapTools/printMap.php (added)
• branches/development/mapTools/print_map.php (deleted)
• branches/development/mapfiles/default.map (modified) (1 diff)
• branches/development/mapfiles/internet.map (modified) (4 diffs)

branches/development/atlas.php

@@ -48 +48 @@
-<script type="text/javascript" src="mapTools/ict4dLegend.js"></script>
-<script type="text/javascript" src="mapTools/mapselector.js"></script>
+<script type="text/javascript" src="mapTools/yearComparisonTool.js"></script>
-<script type="text/javascript" src="javascripts/effects.js"></script>
-<script type="text/javascript" src="javascripts/mapcontrols.js"></script>
+<script type="text/javascript" src="javascripts/cookie.js"></script>
+
-
-<script type="text/javascript" src="javascripts/ict4dApp.js"></script> 
@@ -89 +92 @@
-    <div id="mapTips"></div>
-      <div id="controls" class="fr">
+      <a href="javascript:theApp.yearComparisonTool();">analysis</a>
-                <span><?php echo Locale::translate('map.selector.layer'); ?></span>
-                <select id="LayerSelector" name="LayerSelector" class="inline" onChange="LayerSelectionChanged();">

branches/development/javascripts/ict4dApp.js

@@ -19 +19 @@
-    //$('YearSelector').value = '2002';
-    theApp.ict4dOnLoad($F('LayerSelector') + "." + $F('MapSelector') + "." + $F('YearSelector'));
-
-
-
+
+
-
-var queryParams = null;
@@ -50 +49 @@
-    initialize: function() 
-    {
+        //this.sInitialMapLayer: "regions.internet.2004";
-    },
-    
@@ -132 +132 @@
-        
-            this.oKaMap.initialize( szMap, szExtents, szCPS );
-            this.oKaMap.selectMap('internet');
-        },
-            
@@ -144 +143 @@
-            //myMapInitialized( null, theApp.oKaMap.getCurrentMap().name );
-            theApp.oMapSelector.selectionChanged(theApp.sInitialMapLayer);
+            
-        },
-        
@@ -185 +185 @@
-                var scale = theApp.oKaMap.getCurrentScale();
-                theApp.oScalebar.update(scale);
-
+                       
-            //Activate query button
-            //switchMode('toolPan');
@@ -250 +250 @@
-        
-        layersChanged: function (eventID, map) {
+                var map = theApp.oKaMap.getCurrentMap();                
-                theApp.updateLinkToView();
-        },
@@ -297 +298 @@
-        }, 
-        
+        yearComparisonTool: function() {
+                var url = theApp.baseUrl + 'mapTools/yearComparisonTool.php';
+                var params = 'layer='+$F('LayerSelector')+"."+$F('MapSelector')+"."+$F('YearSelector');
+                var WindowUpdater = new Ajax.Updater('overlay-content', 
+                                                url,
+                                                {parameters: params, onComplete: Window.toggle()});             
+        
+        },
+        
-        printMap: function () { 
-            var szLayers = '';
@@ -308 +318 @@
-            var scale = theApp.oKaMap.getCurrentScale();
-            var cMap = theApp.oKaMap.getCurrentMap().name;
-            console.log(theApp.oKaMap.getCurrentMap());
-            console.log(cMap);
-            var title = theApp.oMapSelector.currentSelection;
-            
@@ -318 +326 @@
-            
-            // to enable different output formats, a window will be needed
-_m
+M
-            // but since we're forcing .PNG files we can just make a request
-            //TODO: do this.

branches/development/locale/en_CA.xml

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE locale SYSTEM "locale.dtd">
-
-<locale name="en_CA" full_name="Canadian English">
@@ -14 +15 @@
-        <message key="welcome.chooseRegion">Please choose a region</message>
-        
+        <message key="map.legend">Legend</message>
-        <message key="map.selector.layer">Layer</message>
-        <message key="map.selector.indicator">Indicator</message>
@@ -26 +28 @@
-        <message key="legend.analysisLayer">Analysis Layer</message>
-        <message key="legend.politicalBoundaries">Political Boundaries</message>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+