Merge pull request #2416 from archesproject/2410_mapbox_upgrade

upgrading mapbox gl js (& draw tools) re: #2410
archesproject · Sep 27, 2017 · 352b28c · 352b28c
2 parents 1675444 + 5885238
commit 352b28c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/arches/app/templates/views/components/widgets/map.htm b/arches/app/templates/views/components/widgets/map.htm
@@ -29,7 +29,7 @@
                     <div class="media">
                         <!-- ko if: geojsonInput() === false && xyInput.active() === false -->
                             <!-- ko if: drawMode() === undefined || drawMode() === 'simple_select' -->
-                            <strong>{% trans "Edit Mode" %}</strong><span data-bind="visible: !minimizeNotifications()"> {% trans "Click a feature to drag or delete. Click lines or polygons twice to edit verticies" %}</span>
+                            <strong>{% trans "Edit Mode" %}</strong><span data-bind="visible: !minimizeNotifications()"> {% trans "Click a feature to drag or delete. Click lines or polygons twice to edit vertices" %}</span>
                             <!-- /ko -->
                         <!-- /ko -->
                         <!-- ko if: drawMode() === 'draw_point'-->
@@ -42,7 +42,7 @@
                         <strong>{% trans "Create Mode" %}</strong><span data-bind="visible: !minimizeNotifications()"> {% trans "You are creating lines. Click the Line tool to exit." %}</span>
                         <!-- /ko -->
                         <!-- ko if: drawMode() === 'direct_select'-->
-                        <strong>{% trans "Edit Mode" %}</strong><span data-bind="visible: !minimizeNotifications()"> {% trans "You are editing " %}<span data-bind="text: selectedFeatureType"></span>{% trans " verticies. Click outside the feature to exit." %}</span>
+                        <strong>{% trans "Edit Mode" %}</strong><span data-bind="visible: !minimizeNotifications()"> {% trans "You are editing " %}<span data-bind="text: selectedFeatureType"></span>{% trans " vertices. Click outside the feature to exit." %}</span>
                         <!-- /ko -->
                         <!-- ko if: geojsonInput -->
                         <strong>{% trans "Geojson Mode "%}</strong><span data-bind="visible: !minimizeNotifications()"> {% trans "Enter a GeoJSON geometry to add a feature" %}</span>

diff --git a/bower.json b/bower.json
@@ -36,8 +36,8 @@
 		"font-awesome": "~4.6.3",
 		"ionicons": "~2.0.1",
 		"fonts": "https://google-fonts.azurewebsites.net/googleFonts/openSans?family=Open+Sans:300,400,600,700&subset=latin",
-		"mapbox-gl": "archesproject/mapbox-gl-js-bower#0.35.1",
-		"mapbox-gl-draw": "https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-draw/v0.17.0/mapbox-gl-draw.js",
+		"mapbox-gl": "archesproject/mapbox-gl-js-bower#0.40.1",
+		"mapbox-gl-draw": "https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-draw/v1.0.2/mapbox-gl-draw.js",
 		"datatables.net": "~1.10.12",
 		"datatables.net-bs": "~1.10.12",
 		"datatables.net-responsive": "~2.1.0",
@@ -55,9 +55,5 @@
 		"leaflet-draw": "^0.4.9",
 		"ckeditor": "~4.6.2",
 		"mathjs": "^3.11.4"
-	},
-	"resolutions": {
-		"bootstrap": "3.3.2",
-		"jquery": "2.2.1"
 	}
 }