Index: trunk/webapps/cptms/data_layers/cms_locations_D12.gjson
===================================================================
--- trunk/webapps/cptms/data_layers/cms_locations_D12.gjson	(revision 326)
+++ trunk/webapps/cptms/data_layers/cms_locations_D12.gjson	(revision 430)
@@ -4,5 +4,5 @@
   {
   "type": "Feature",
-  "id": "1200022",
+  "id": "74",
   "geometry":
       {
@@ -18,5 +18,5 @@
   {
   "type": "Feature",
-  "id": "1200023",
+  "id": "31",
   "geometry":
       {
@@ -32,5 +32,5 @@
   {
   "type": "Feature",
-  "id": "1200024",
+  "id": "95",
   "geometry":
       {
@@ -46,5 +46,5 @@
   {
   "type": "Feature",
-  "id": "1200025",
+  "id": "93",
   "geometry":
       {
@@ -60,5 +60,5 @@
   {
   "type": "Feature",
-  "id": "1200026",
+  "id": "57",
   "geometry":
       {
@@ -74,5 +74,5 @@
   {
   "type": "Feature",
-  "id": "1200027",
+  "id": "91",
   "geometry":
       {
@@ -88,5 +88,5 @@
   {
   "type": "Feature",
-  "id": "1200028",
+  "id": "53",
   "geometry":
       {
@@ -102,5 +102,5 @@
   {
   "type": "Feature",
-  "id": "1200029",
+  "id": "73",
   "geometry":
       {
@@ -116,5 +116,5 @@
   {
   "type": "Feature",
-  "id": "1200030",
+  "id": "75",
   "geometry":
       {
@@ -130,5 +130,5 @@
   {
   "type": "Feature",
-  "id": "1200031",
+  "id": "92",
   "geometry":
       {
@@ -144,5 +144,5 @@
   {
   "type": "Feature",
-  "id": "1200032",
+  "id": "44",
   "geometry":
       {
@@ -158,5 +158,5 @@
   {
   "type": "Feature",
-  "id": "1200033",
+  "id": "90",
   "geometry":
       {
@@ -172,5 +172,5 @@
   {
   "type": "Feature",
-  "id": "1200034",
+  "id": "54",
   "geometry":
       {
@@ -186,5 +186,5 @@
   {
   "type": "Feature",
-  "id": "1200035",
+  "id": "98",
   "geometry":
       {
@@ -200,5 +200,5 @@
   {
   "type": "Feature",
-  "id": "1200036",
+  "id": "77",
   "geometry":
       {
@@ -214,5 +214,5 @@
   {
   "type": "Feature",
-  "id": "1200037",
+  "id": "94",
   "geometry":
       {
@@ -228,5 +228,5 @@
   {
   "type": "Feature",
-  "id": "1200038",
+  "id": "40",
   "geometry":
       {
@@ -242,5 +242,5 @@
   {
   "type": "Feature",
-  "id": "1200039",
+  "id": "70",
   "geometry":
       {
@@ -256,5 +256,5 @@
   {
   "type": "Feature",
-  "id": "1200040",
+  "id": "72",
   "geometry":
       {
@@ -270,5 +270,5 @@
   {
   "type": "Feature",
-  "id": "1200041",
+  "id": "65",
   "geometry":
       {
@@ -284,5 +284,5 @@
   {
   "type": "Feature",
-  "id": "1200042",
+  "id": "97",
   "geometry":
       {
@@ -298,5 +298,5 @@
   {
   "type": "Feature",
-  "id": "1200043",
+  "id": "66",
   "geometry":
       {
@@ -312,5 +312,5 @@
   {
   "type": "Feature",
-  "id": "1200044",
+  "id": "79",
   "geometry":
       {
@@ -326,5 +326,5 @@
   {
   "type": "Feature",
-  "id": "1200045",
+  "id": "78",
   "geometry":
       {
@@ -340,5 +340,5 @@
   {
   "type": "Feature",
-  "id": "1200046",
+  "id": "99",
   "geometry":
       {
@@ -354,5 +354,5 @@
   {
   "type": "Feature",
-  "id": "1200047",
+  "id": "80",
   "geometry":
       {
@@ -368,5 +368,5 @@
   {
   "type": "Feature",
-  "id": "1200048",
+  "id": "81",
   "geometry":
       {
@@ -382,5 +382,5 @@
   {
   "type": "Feature",
-  "id": "1200049",
+  "id": "55",
   "geometry":
       {
@@ -396,5 +396,5 @@
   {
   "type": "Feature",
-  "id": "1200050",
+  "id": "82",
   "geometry":
       {
@@ -410,5 +410,5 @@
   {
   "type": "Feature",
-  "id": "1200051",
+  "id": "37",
   "geometry":
       {
@@ -424,5 +424,5 @@
   {
   "type": "Feature",
-  "id": "1200052",
+  "id": "87",
   "geometry":
       {
@@ -438,5 +438,5 @@
   {
   "type": "Feature",
-  "id": "1200053",
+  "id": "71",
   "geometry":
       {
@@ -452,5 +452,5 @@
   {
   "type": "Feature",
-  "id": "1200055",
+  "id": "76",
   "geometry":
       {
@@ -466,5 +466,5 @@
   {
   "type": "Feature",
-  "id": "1200056",
+  "id": "86",
   "geometry":
       {
@@ -480,5 +480,5 @@
   {
   "type": "Feature",
-  "id": "1200057",
+  "id": "83",
   "geometry":
       {
@@ -494,5 +494,5 @@
   {
   "type": "Feature",
-  "id": "1200058",
+  "id": "51",
   "geometry":
       {
@@ -508,5 +508,5 @@
   {
   "type": "Feature",
-  "id": "1208488",
+  "id": "63",
   "geometry":
       {
@@ -522,5 +522,5 @@
   {
   "type": "Feature",
-  "id": "1211184",
+  "id": "88",
   "geometry":
       {
@@ -536,5 +536,5 @@
   {
   "type": "Feature",
-  "id": "1211185",
+  "id": "89",
   "geometry":
       {
@@ -550,5 +550,5 @@
   {
   "type": "Feature",
-  "id": "1211967",
+  "id": "84",
   "geometry":
       {
@@ -564,5 +564,5 @@
   {
   "type": "Feature",
-  "id": "1211978",
+  "id": "85",
   "geometry":
       {
@@ -578,5 +578,5 @@
   {
   "type": "Feature",
-  "id": "1212138",
+  "id": "30",
   "geometry":
       {
@@ -592,5 +592,5 @@
   {
   "type": "Feature",
-  "id": "1212822",
+  "id": "96",
   "geometry":
       {
@@ -606,5 +606,5 @@
   {
   "type": "Feature",
-  "id": "1212823",
+  "id": "69",
   "geometry":
       {
@@ -620,5 +620,5 @@
   {
   "type": "Feature",
-  "id": "1214503",
+  "id": "10",
   "geometry":
       {
@@ -634,5 +634,5 @@
   {
   "type": "Feature",
-  "id": "1214504",
+  "id": "11",
   "geometry":
       {
@@ -648,5 +648,5 @@
   {
   "type": "Feature",
-  "id": "1214505",
+  "id": "12",
   "geometry":
       {
@@ -662,5 +662,5 @@
   {
   "type": "Feature",
-  "id": "1214506",
+  "id": "13",
   "geometry":
       {
@@ -676,5 +676,5 @@
   {
   "type": "Feature",
-  "id": "1214507",
+  "id": "14",
   "geometry":
       {
@@ -690,5 +690,5 @@
   {
   "type": "Feature",
-  "id": "1214508",
+  "id": "15",
   "geometry":
       {
@@ -704,5 +704,5 @@
   {
   "type": "Feature",
-  "id": "1214509",
+  "id": "17",
   "geometry":
       {
@@ -718,5 +718,5 @@
   {
   "type": "Feature",
-  "id": "1214510",
+  "id": "18",
   "geometry":
       {
@@ -732,5 +732,5 @@
   {
   "type": "Feature",
-  "id": "1214511",
+  "id": "19",
   "geometry":
       {
@@ -746,5 +746,5 @@
   {
   "type": "Feature",
-  "id": "1214512",
+  "id": "20",
   "geometry":
       {
@@ -760,5 +760,5 @@
   {
   "type": "Feature",
-  "id": "1214513",
+  "id": "21",
   "geometry":
       {
@@ -774,5 +774,5 @@
   {
   "type": "Feature",
-  "id": "1214514",
+  "id": "23",
   "geometry":
       {
@@ -788,5 +788,5 @@
   {
   "type": "Feature",
-  "id": "1214956",
+  "id": "16",
   "geometry":
       {
@@ -802,19 +802,5 @@
   {
   "type": "Feature",
-  "id": "1217542",
-  "geometry":
-      {
-      "type": "Point",
-      "coordinates": [-117.76848,33.69002]
-      },
-  "properties":
-      {
-      "location":"S I-5 25.00",
-      "street":"Test CMS"
-      }
-  },
-  {
-  "type": "Feature",
-  "id": "1218442",
+  "id": "35",
   "geometry":
       {
@@ -830,5 +816,5 @@
   {
   "type": "Feature",
-  "id": "1218482",
+  "id": "24",
   "geometry":
       {
@@ -844,5 +830,5 @@
   {
   "type": "Feature",
-  "id": "1218483",
+  "id": "25",
   "geometry":
       {
@@ -858,5 +844,5 @@
   {
   "type": "Feature",
-  "id": "1218484",
+  "id": "32",
   "geometry":
       {
@@ -872,5 +858,5 @@
   {
   "type": "Feature",
-  "id": "1218485",
+  "id": "33",
   "geometry":
       {
@@ -886,5 +872,5 @@
   {
   "type": "Feature",
-  "id": "1218486",
+  "id": "34",
   "geometry":
       {