Separating GeoJSON and EsriJSON geometry parsing and putting in two s…

…eparate super-layers from which all other layers extend. Closes #44.
JasonSanford · Feb 18, 2012 · 3ef97e9 · 3ef97e9
1 parent 2b28a6a
commit 3ef97e9
Show file tree

Hide file tree

Showing 19 changed files with 66 additions and 213 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -10,3 +10,4 @@
 1.3.0
 - New GIS Cloud layer (gvector.GISCloud)
 - DRYing up the code. Moved _processFeatures from individual layers into Layer.js
+- Creating two super-layers from which all other layers extend from: GeoJSONLayer and EsriJSONLayer
diff --git a/build/Makefile b/build/Makefile
@@ -4,6 +4,8 @@
     --js ../src/core/Util.js \
     --js ../src/core/Class.js \
     --js ../src/layer/Layer.js \
+    --js ../src/layer/GeoJSONLayer.js \
+    --js ../src/layer/EsriJSONLayer.js \
     --js ../src/layer/AGS.js \
     --js ../src/layer/A2E.js \
     --js ../src/layer/GeoIQ.js \

diff --git a/build/build.bat b/build/build.bat
@@ -4,10 +4,12 @@ java -jar ../lib/closure-compiler/compiler.jar ^
 --js ../src/core/Util.js ^
 --js ../src/core/Class.js ^
 --js ../src/layer/Layer.js ^
---js ../src/layer/AGS.js ^
+--js ../src/layer/GeoJSONLayer.js ^
+--js ../src/layer/EsriJSONLayer.js ^
+--js ../src/layer/AGS.js ^
 --js ../src/layer/A2E.js ^
---js ../src/layer/GeoIQ.js ^
---js ../src/layer/CartoDB.js ^
---js ../src/layer/PRWSF.js ^
+--js ../src/layer/GeoIQ.js ^
+--js ../src/layer/CartoDB.js ^
+--js ../src/layer/PRWSF.js ^
 --js ../src/layer/GISCloud.js ^
 --js_output_file ../dist/gvector.js
diff --git a/build/build.html b/build/build.html
@@ -173,7 +173,7 @@ <h1>Google Vector Layers Build Helper</h1>
 			label.appendChild(check);
 			check.onchange = onCheckboxChange;
 
-			if (name == 'Core') {
+			if (name == 'Core' || name == 'Layer') {
 				check.checked = true;
 				check.disabled = true;
 			}

diff --git a/build/deps.js b/build/deps.js
@@ -11,46 +11,60 @@ var deps = {
         desc: 'The base class for all layers',
         heading: 'Layers Core'
     },
+
+    GeoJSONLayer: {
+        src: ['layer/GeoJSONLayer.js'],
+        desc: 'The GeoJSON geometry parsing layer type',
+        heading: 'Layers that extend this can parse GeoJSON geometry',
+        deps: ['Layer']
+    },
+
+    EsriJSONLayer: {
+        src: ['layer/EsriJSONLayer.js'],
+        desc: 'The EsriJSON geometry parsing layer type',
+        heading: 'Layers that extend this can parse EsriJSON geometry',
+        deps: ['Layer']
+    },
 
     AGS: {
         src: ['layer/AGS.js'],
         desc: 'The ArcGIS Server layer.',
         heading: 'ArcGIS Server',
-        deps: ['Layer']
+        deps: ['EsriJSONLayer']
     },
 
     A2E: {
         src: ['layer/A2E.js'],
         desc: 'The Arc2Earth layer.',
         heading: 'Arc2Earth',
-        deps: ['Layer', 'AGS']
+        deps: ['AGS']
     },
 
     GeoIQ: {
         src: ['layer/GeoIQ.js'],
         desc: 'The GeoIQ layer.',
         heading: 'GeoIQ',
-        deps: ['Layer']
+        deps: ['GeoJSONLayer']
     },
 
     CartoDB: {
         src: ['layer/CartoDB.js'],
         desc: 'The CartoDB layer.',
         heading: 'CartoDB',
-        deps: ['Layer']
+        deps: ['GeoJSONLayer']
     },
 
     PRWSF: {
         src: ['layer/PRWSF.js'],
         desc: 'The PostGIS RESTful Web Service Framework layer.',
         heading: 'PostGIS RESTful Web Service Framework',
-        deps: ['Layer']
+        deps: ['GeoJSONLayer']
     },
 
     GISCloud: {
         src: ['layer/GISCloud.js'],
         desc: 'The GIS Cloud Layer',
         heading: 'GIS Cloud',
-        deps: ['Layer']
+        deps: ['GeoJSONLayer']
     }
 };
diff --git a/debug/gvector-include.js b/debug/gvector-include.js
@@ -10,6 +10,8 @@
         'core/Class.js',
 
         'layer/Layer.js',
+        'layer/GeoJSONLayer.js',
+        'layer/EsriJSONLayer.js',
 
         'layer/AGS.js',
         'layer/A2E.js',

diff --git a/demos/arc2earth/index.html b/demos/arc2earth/index.html
@@ -142,7 +142,7 @@ <h2>Arc2Earth Sync</h2>
         <script src="../../docs-demo/js/jquery-1.5.2.min.js" type="text/javascript"></script>
         <script src="../../docs-demo/js/docs-demos.js" type="text/javascript"></script>
         <script src="../../docs-demo/js/bootstrap-dropdown.js" type="text/javascript"></script>
-        <script src="../../debug/gvector-include.js" type="text/javascript"></script>
+        <script src="../../dist/gvector.js" type="text/javascript"></script>
         <script type="text/javascript">
             var map1, map2;
             var a2e_light_rail_lines, a2e_light_rail_stations, a2e_vgi;

diff --git a/demos/arcgis-server/index.html b/demos/arcgis-server/index.html
@@ -351,7 +351,7 @@ <h2>Winter Weather</h2>
         <script src="../../docs-demo/js/jquery-1.5.2.min.js" type="text/javascript"></script>
         <script src="../../docs-demo/js/docs-demos.js" type="text/javascript"></script>
         <script src="../../docs-demo/js/bootstrap-dropdown.js" type="text/javascript"></script>
-        <script src="../../debug/gvector-include.js" type="text/javascript"></script>
+        <script src="../../dist/gvector.js" type="text/javascript"></script>
         <script type="text/javascript">
             var map1, map2, map3, map4, map5;
             var ags_light_rail, ags_districts, ags_census, ags_intersections, ags_winter, ags_311;

diff --git a/demos/cartodb/index.html b/demos/cartodb/index.html
@@ -177,7 +177,7 @@ <h2>Flood Zones</h2>
         <script src="../../docs-demo/js/jquery-1.5.2.min.js" type="text/javascript"></script>
         <script src="../../docs-demo/js/docs-demos.js" type="text/javascript"></script>
         <script src="../../docs-demo/js/bootstrap-dropdown.js" type="text/javascript"></script>
-        <script src="../../debug/gvector-include.js" type="text/javascript"></script>
+        <script src="../../dist/gvector.js" type="text/javascript"></script>
         <script type="text/javascript">
             var map1, map2;
             var cartodb_sewer_line, cartodb_man_hole, cartodb_flood_zones;

diff --git a/demos/geoiq/index.html b/demos/geoiq/index.html
@@ -231,7 +231,7 @@ <h2>Mecklenburg County Parks</h2>
         <script src="../../docs-demo/js/jquery-1.5.2.min.js" type="text/javascript"></script>
         <script src="../../docs-demo/js/docs-demos.js" type="text/javascript"></script>
         <script src="../../docs-demo/js/bootstrap-dropdown.js" type="text/javascript"></script>
-        <script src="../../debug/gvector-include.js" type="text/javascript"></script>
+        <script src="../../dist/gvector.js" type="text/javascript"></script>
         <script type="text/javascript">
             var map1, map2, map3;
             var geoiq_ski_areas, geoiq_foss4g_reg, geoiq_parks;

diff --git a/demos/gis-cloud/index.html b/demos/gis-cloud/index.html
@@ -127,7 +127,7 @@ <h2>Blah</h2>
         <script src="../../docs-demo/js/jquery-1.5.2.min.js" type="text/javascript"></script>
         <script src="../../docs-demo/js/docs-demos.js" type="text/javascript"></script>
         <script src="../../docs-demo/js/bootstrap-dropdown.js" type="text/javascript"></script>
-        <script src="../../debug/gvector-include.js" type="text/javascript"></script>
+        <script src="../../dist/gvector.js" type="text/javascript"></script>
         <script type="text/javascript">
             var map1;
             var giscloud;

diff --git a/demos/postgis-restful-web-service-framework/index.html b/demos/postgis-restful-web-service-framework/index.html
@@ -214,7 +214,7 @@ <h2>Bus Stops</h2>
         <script src="../../docs-demo/js/jquery-1.5.2.min.js" type="text/javascript"></script>
         <script src="../../docs-demo/js/docs-demos.js" type="text/javascript"></script>
         <script src="../../docs-demo/js/bootstrap-dropdown.js" type="text/javascript"></script>
-        <script src="../../debug/gvector-include.js" type="text/javascript"></script>
+        <script src="../../dist/gvector.js" type="text/javascript"></script>
         <script type="text/javascript">
             var map1, map2, map3, map4;
             var prwsf_preservation, prwsf_hydrants, prwsf_libraries, prwsf_bus;