Added properties to mysim simulation

ReGIS-org · Sep 20, 2017 · 18f1f83 · 18f1f83
1 parent 49c5b4c
commit 18f1f83
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 43 deletions.
diff --git a/simcity-slurm/simulations/mysim/makeCircle.py b/simcity-slurm/simulations/mysim/makeCircle.py
@@ -33,7 +33,12 @@
           coords
         ]
       },
-      "properties": {},
+      "properties": {
+        'name': 'Circle-1',
+        'x': x,
+        'y': y,
+        'radius': r
+      },
       "id": "xxxx_-8000"
     }
   ]

diff --git a/simcity-webservice/resources/mysim.json b/simcity-webservice/resources/mysim.json
@@ -1,13 +1,13 @@
 {
-    "id": "matsim",
-    "title": "matsim",
+    "id": "mysim",
+    "title": "mysim",
     "featureTypes": {
         "MapPoint": {
-            "id": "SimCity#firestation",
+            "id": "MySim#MapPoint",
             "name": "MapPoint",
             "style": {
                 "drawingMode": "Point",
-                "iconUri": "data/projects/simcity-demo/images/pin.png",
+                "iconUri": "data/projects/regis-demo/images/pin.png",
                 "cornerRadius": 50,
                 "fillColor": "#ffffff",
                 "iconWidth": 30,
@@ -17,70 +17,51 @@
             "propertyTypeKeys": "title,notes",
             "u": "bower_components/csweb/dist-bower/images/marker.png"
         },
-        "Ward": {
-            "id": "SimCity#Ward",
-            "name": "Ward",
+        "Circle": {
+            "id": "MySim#Circle",
+            "name": "Circle",
             "style": {
-                "nameLabel": "ward_name",
+                "nameLabel": "name",
                 "drawingMode": "Polygon",
                 "cornerRadius": 50,
                 "fillColor": "#999999",
                 "iconWidth": 30,
                 "iconHeight": 30,
                 "strokeColor": "#ffffff"
             },
-            "propertyTypeKeys": "ward_name;ward_no;cmc_mc_nm;tot_p;first_responder;second_responder",
+            "propertyTypeKeys": "name;x;y;radius",
             "u": "bower_components/csweb/dist-bower/images/marker.png"
         }
     },
     "propertyTypeData": {
-        "ward_no": {
-            "label": "ward_no",
-            "type": "text",
-            "title": "Ward Number",
-            "visibleInCallOut": true,
-            "canEdit": false,
-            "isSearchable": true,
-            "section": "Metadata"
-        },
-        "ward_name": {
+        "name": {
             "label": "Name",
             "type": "text",
-            "title": "Name",
+            "title": "Circle Name",
             "visibleInCallOut": true,
             "canEdit": false,
-            "isSearchable": true,
-            "section": "Metadata"
+            "isSearchable": true
         },
-        "cmc_mc_nm": {
-            "label": "cmc_mc_nm",
+        "x": {
+            "label": "x",
             "type": "number",
-            "title": "City Name",
-            "canEdit": false,
-            "isSearchable": true,
+            "title": "X",
             "visibleInCallOut": true,
-            "section": "Metadata"
-        },
-        "first_responder": {
-            "label": "first_responder",
-            "type": "number",
-            "title": "First Responder",
             "canEdit": false,
-            "isSearchable": true,
-            "visibleInCallOut": true
+            "isSearchable": true
         },
-        "second_responder": {
-            "label": "second_responder",
+        "y": {
+            "label": "y",
             "type": "number",
-            "title": "Second Responder",
+            "title": "Y",
             "canEdit": false,
             "isSearchable": true,
             "visibleInCallOut": true
         },
-        "tot_p": {
-            "label": "tot_p",
+        "radius": {
+            "label": "radius",
             "type": "number",
-            "title": "Total Population",
+            "title": "Radius",
             "canEdit": false,
             "isSearchable": true,
             "visibleInCallOut": true

diff --git a/simcity-webservice/simulations/mysim.json b/simcity-webservice/simulations/mysim.json
@@ -4,6 +4,7 @@
     "command": "~/simulations/mysim/run.sh",
     "parallelism": "*",
     "resourceTypeUrl": "/explore/resource/mysim",
+    "defaultFeatureType": "Circle",
     "form": [
       "radius",
       {
@@ -25,7 +26,7 @@
     "properties": {
       "radius": {
         "type": "number",
-        "minimum": 1,
+        "minimum": 0,
         "maximum": 50,
         "default": 10,
         "title": "Radius",