find & replace mapnew > map

Author: archmoj

.circleci/test.sh

@@ -96,7 +96,7 @@ case $1 in
         SUITE=$({\
                   find $ROOT/test/image/mocks/gl*     -type f -printf "%f\n"; \
                   find $ROOT/test/image/mocks/mapbox* -type f -printf "%f\n"; \
-                  find $ROOT/test/image/mocks/mapnew* -type f -printf "%f\n"; \
+                  find $ROOT/test/image/mocks/map* -type f -printf "%f\n"; \
                 } | sed 's/\.json$//1' | circleci tests split)
         python3 test/image/make_baseline.py virtual-webgl $SUITE || EXIT_STATE=$?
         exit $EXIT_STATE

lib/choroplethmapnew.js

@@ -1,3 +1,3 @@
 'use strict';
 
-module.exports = require('../src/traces/choroplethmapnew');
+module.exports = require('../src/traces/choroplethmap');

lib/densitymapnew.js

@@ -1,3 +1,3 @@
 'use strict';
 
-module.exports = require('../src/traces/densitymapnew');
+module.exports = require('../src/traces/densitymap');

lib/index-mapnew.js

@@ -4,9 +4,9 @@ var Plotly = require('./core');
 
 Plotly.register([
     // traces
-    require('./scattermapnew'),
-    require('./choroplethmapnew'),
-    require('./densitymapnew'),
+    require('./scattermap'),
+    require('./choroplethmap'),
+    require('./densitymap'),
 
     // transforms
     require('./aggregate'),

lib/index-strict.js

@@ -39,9 +39,9 @@ Plotly.register([
     require('./scattermapbox'),
     require('./choroplethmapbox'),
     require('./densitymapbox'),
-    require('./scattermapnew'),
-    require('./choroplethmapnew'),
-    require('./densitymapnew'),
+    require('./scattermap'),
+    require('./choroplethmap'),
+    require('./densitymap'),
     require('./sankey'),
     require('./indicator'),
     require('./table'),

lib/index.js

@@ -39,9 +39,9 @@ Plotly.register([
     require('./scattermapbox'),
     require('./choroplethmapbox'),
     require('./densitymapbox'),
-    require('./scattermapnew'),
-    require('./choroplethmapnew'),
-    require('./densitymapnew'),
+    require('./scattermap'),
+    require('./choroplethmap'),
+    require('./densitymap'),
     require('./sankey'),
     require('./indicator'),
     require('./table'),

lib/scattermapnew.js

@@ -1,3 +1,3 @@
 'use strict';
 
-module.exports = require('../src/traces/scattermapnew');
+module.exports = require('../src/traces/scattermap');

src/components/fx/hover.js

@@ -1564,7 +1564,7 @@ function getHoverLabelText(d, showCommonLabel, hovermode, fullLayout, t0, g) {
         if(
             d.trace.type !== 'choropleth' &&
             d.trace.type !== 'choroplethmapbox' &&
-            d.trace.type !== 'choroplethmapnew'
+            d.trace.type !== 'choroplethmap'
         ) {
             text += (text ? 'z: ' : '') + d.zLabel;
         }

src/components/fx/layout_defaults.js

@@ -19,10 +19,10 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut) {
     var dragMode = coerce('dragmode');
     if(dragMode === 'select') coerce('selectdirection');
 
-    // if only mapbox, mapnew or geo subplots is present on graph,
+    // if only mapbox, map or geo subplots is present on graph,
     // reset 'zoom' dragmode to 'pan' until 'zoom' is implemented,
     // so that the correct modebar button is active
-    var hasMap = layoutOut._has('mapbox') || layoutOut._has('mapnew');
+    var hasMap = layoutOut._has('mapbox') || layoutOut._has('map');
     var hasGeo = layoutOut._has('geo');
     var len = layoutOut._basePlotModules.length;
 

src/components/legend/style.js

@@ -542,14 +542,14 @@ module.exports = function style(s, gd, legend) {
                     break;
                 case 'choropleth' :
                 case 'choroplethmapbox' :
-                case 'choroplethmapnew' :
+                case 'choroplethmap' :
                     ptsData = [
                         ['M-6,-6V6H6V-6Z']
                     ];
                     useGradient = true;
                     break;
                 case 'densitymapbox' :
-                case 'densitymapnew' :
+                case 'densitymap' :
                     ptsData = [
                         ['M-6,0 a6,6 0 1,0 12,0 a 6,6 0 1,0 -12,0']
                     ];