Merge branches 'pr/25' and 'pr/9'

ngageoint · May 2, 2014 · 9c7f305 · 9c7f305
3 parents 4ea634e + 9c021a2 + 641eeaf
commit 9c7f305
Show file tree

Hide file tree

Showing 61 changed files with 6,195 additions and 975 deletions.
diff --git a/docs/ADDING-LAYERS.md b/docs/ADDING-LAYERS.md
@@ -0,0 +1,26 @@
+# GeoQ - Adding Layers
+
+## ESRI Image Layer provided via a Query Map Service
+- This method was created to work with FEMA CAP data and also has been tested with FEMA Disaster Reporter Photos
+
+1. Go to Layer management page
+2. Add a new layer
+3. Name: pick something appropriate - "FEMA EA Disaster Reporter Photos"
+4. Type: "ESRI Cluster Feature Layer"
+5. Url: This is the Url for the restful endpoint - "http://services.femadata.com/arcgis/rest/services/ExternalAffairs/DisasterReporterService/MapServer/0"
+6. Image Format: "json"
+7. Layer params: This is used to pass information to layer handler.  You can use any of the parameters for an [ArcGIS Query Map Service Layer](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#//02r3000000p1000000).  Additionaly, you if you want to customize your markers, you will need to set "createMarker" with an appropriate function name from the leaflet_helper.createMarker javascript object.
+   Supported functions are:
+    1. esriImageMapService - Processes images from an ESRI MapService
+
+   All of the data should be in JSON format:
+    ```javascript
+    {
+     "returnGeometry":"true",
+     "where":"1=1",
+     "createMarker":"esriImageMapService",
+     "spatialRel":"esriSpatialRelIntersects"
+    }
+    ```
+7. Save your layer
+9. You can now add your layer to a map and test for functionality
diff --git a/geoq/badges/__init__.py b/geoq/badges/__init__.py
diff --git a/geoq/badges/admin.py b/geoq/badges/admin.py
diff --git a/geoq/badges/badges_notes.txt b/geoq/badges/badges_notes.txt
diff --git a/geoq/badges/fixtures/initial_data.json b/geoq/badges/fixtures/initial_data.json
diff --git a/geoq/badges/managers.py b/geoq/badges/managers.py