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']
                     ];

src/components/modebar/buttons.js

@@ -652,7 +652,7 @@ modeBarButtons.resetViews = {
 
         resetView(gd, 'geo');
         resetView(gd, 'mapbox');
-        resetView(gd, 'mapnew');
+        resetView(gd, 'map');
     }
 };
 
@@ -696,14 +696,14 @@ modeBarButtons.resetViewMapbox = {
     }
 };
 
-modeBarButtons.resetViewMapnew = {
-    name: 'resetViewMapnew',
+modeBarButtons.resetViewMap = {
+    name: 'resetViewMap',
     _cat: 'resetView',
     title: function(gd) { return _(gd, 'Reset view'); },
     attr: 'reset',
     icon: Icons.home,
     click: function(gd) {
-        resetView(gd, 'mapnew');
+        resetView(gd, 'map');
     }
 };
 
@@ -717,14 +717,14 @@ modeBarButtons.zoomInMapbox = {
     click: handleMapboxZoom
 };
 
-modeBarButtons.zoomInMapnew = {
-    name: 'zoomInMapnew',
+modeBarButtons.zoomInMap = {
+    name: 'zoomInMap',
     _cat: 'zoomin',
     title: function(gd) { return _(gd, 'Zoom in'); },
     attr: 'zoom',
     val: 'in',
     icon: Icons.zoom_plus,
-    click: handleMapnewZoom
+    click: handleMapZoom
 };
 
 modeBarButtons.zoomOutMapbox = {
@@ -737,22 +737,22 @@ modeBarButtons.zoomOutMapbox = {
     click: handleMapboxZoom
 };
 
-modeBarButtons.zoomOutMapnew = {
-    name: 'zoomOutMapnew',
+modeBarButtons.zoomOutMap = {
+    name: 'zoomOutMap',
     _cat: 'zoomout',
     title: function(gd) { return _(gd, 'Zoom out'); },
     attr: 'zoom',
     val: 'out',
     icon: Icons.zoom_minus,
-    click: handleMapnewZoom
+    click: handleMapZoom
 };
 
 function handleMapboxZoom(gd, ev) {
     _handleMapZoom(gd, ev, 'mapbox');
 }
 
-function handleMapnewZoom(gd, ev) {
-    _handleMapZoom(gd, ev, 'mapnew');
+function handleMapZoom(gd, ev) {
+    _handleMapZoom(gd, ev, 'map');
 }
 
 function _handleMapZoom(gd, ev, mapType) {

src/components/modebar/manage.js

@@ -110,7 +110,7 @@ function getButtonGroups(gd) {
     var hasGL2D = fullLayout._has('gl2d');
     var hasTernary = fullLayout._has('ternary');
     var hasMapbox = fullLayout._has('mapbox');
-    var hasMapnew = fullLayout._has('mapnew');
+    var hasMap = fullLayout._has('map');
     var hasPolar = fullLayout._has('polar');
     var hasSmith = fullLayout._has('smith');
     var hasSankey = fullLayout._has('sankey');
@@ -155,7 +155,7 @@ function getButtonGroups(gd) {
     var resetGroup = [];
     var dragModeGroup = [];
 
-    if((hasCartesian || hasGL2D || hasPie || hasFunnelarea || hasTernary) + hasGeo + hasGL3D + hasMapbox + hasMapnew + hasPolar + hasSmith > 1) {
+    if((hasCartesian || hasGL2D || hasPie || hasFunnelarea || hasTernary) + hasGeo + hasGL3D + hasMapbox + hasMap + hasPolar + hasSmith > 1) {
         // graphs with more than one plot types get 'union buttons'
         // which reset the view or toggle hover labels across all subplots.
         hoverGroup = ['toggleHover'];
@@ -171,10 +171,10 @@ function getButtonGroups(gd) {
         zoomGroup = ['zoomInMapbox', 'zoomOutMapbox'];
         hoverGroup = ['toggleHover'];
         resetGroup = ['resetViewMapbox'];
-    } else if(hasMapnew) {
-        zoomGroup = ['zoomInMapnew', 'zoomOutMapnew'];
+    } else if(hasMap) {
+        zoomGroup = ['zoomInMap', 'zoomOutMap'];
         hoverGroup = ['toggleHover'];
-        resetGroup = ['resetViewMapnew'];
+        resetGroup = ['resetViewMap'];
     } else if(hasGL2D) {
         hoverGroup = ['hoverClosestGl2d'];
     } else if(hasPie) {
@@ -205,7 +205,7 @@ function getButtonGroups(gd) {
         dragModeGroup = ['zoom3d', 'pan3d', 'orbitRotation', 'tableRotation'];
     } else if(((hasCartesian || hasGL2D) && !allAxesFixed) || hasTernary) {
         dragModeGroup = ['zoom2d', 'pan2d'];
-    } else if(hasMapbox || hasMapnew || hasGeo) {
+    } else if(hasMapbox || hasMap || hasGeo) {
         dragModeGroup = ['pan2d'];
     } else if(hasPolar) {
         dragModeGroup = ['zoom2d'];
@@ -233,7 +233,7 @@ function getButtonGroups(gd) {
                 if(DRAW_MODES.indexOf(b) !== -1) {
                     // accept pre-defined drag modes i.e. shape drawing features as string
                     if(
-                        fullLayout._has('mapbox') || fullLayout._has('mapnew') || // draw shapes in paper coordinate (could be improved in future to support data coordinate, when there is no pitch)
+                        fullLayout._has('mapbox') || fullLayout._has('map') || // draw shapes in paper coordinate (could be improved in future to support data coordinate, when there is no pitch)
                         fullLayout._has('cartesian') // draw shapes in data coordinate
                     ) {
                         dragModeGroup.push(b);

src/components/selections/select.js

@@ -1549,7 +1549,7 @@ function getFillRangeItems(dragOptions) {
     var plotinfo = dragOptions.plotinfo;
 
     return (
-        plotinfo.fillRangeItems || // allow subplots (i.e. geo, mapbox, mapnew, sankey) to override fillRangeItems routine
+        plotinfo.fillRangeItems || // allow subplots (i.e. geo, mapbox, map, sankey) to override fillRangeItems routine
         makeFillRangeItems(dragOptions.xaxes.concat(dragOptions.yaxes))
     );
 }

src/plot_api/plot_api.js

@@ -518,7 +518,7 @@ function setPlotContext(gd, config) {
         szOut.gl3d = 1;
         szOut.geo = 1;
         szOut.mapbox = 1;
-        szOut.mapnew = 1;
+        szOut.map = 1;
     } else if(typeof szIn === 'string') {
         var parts = szIn.split('+');
         for(i = 0; i < parts.length; i++) {
@@ -528,7 +528,7 @@ function setPlotContext(gd, config) {
         szOut.gl3d = 1;
         szOut.geo = 1;
         szOut.mapbox = 1;
-        szOut.mapnew = 1;
+        szOut.map = 1;
     }
 }
 
@@ -2390,7 +2390,7 @@ var layoutUIControlPatterns = [
     {pattern: /^(polar\d*\.radialaxis)\.((auto)?range|angle|title\.text)/},
     {pattern: /^(polar\d*\.angularaxis)\.rotation/},
     {pattern: /^(mapbox\d*)\.(center|zoom|bearing|pitch)/},
-    {pattern: /^(mapnew\d*)\.(center|zoom|bearing|pitch)/},
+    {pattern: /^(map\d*)\.(center|zoom|bearing|pitch)/},
 
     {pattern: /^legend\.(x|y)$/, attr: 'editrevision'},
     {pattern: /^(shapes|annotations)/, attr: 'editrevision'},

src/plot_api/plot_config.js

@@ -157,12 +157,12 @@ var configAttributes = {
 
     scrollZoom: {
         valType: 'flaglist',
-        flags: ['cartesian', 'gl3d', 'geo', 'mapbox', 'mapnew'],
+        flags: ['cartesian', 'gl3d', 'geo', 'mapbox', 'map'],
         extras: [true, false],
-        dflt: 'gl3d+geo+mapnew',
+        dflt: 'gl3d+geo+map',
         description: [
             'Determines whether mouse wheel or two-finger scroll zooms is enable.',
-            'Turned on by default for gl3d, geo, mapbox and mapnew subplots',
+            'Turned on by default for gl3d, geo, mapbox and map subplots',
             '(as these subplot types do not have zoombox via pan),',
             'but turned off by default for cartesian subplots.',
             'Set `scrollZoom` to *false* to disable scrolling for all subplots.'
@@ -192,7 +192,7 @@ var configAttributes = {
             'This is the time interval (in ms) between first mousedown and',
             '2nd mouseup to constitute a double-click.',
             'This setting propagates to all on-subplot double clicks',
-            '(except for geo, mapbox and mapnew) and on-legend double clicks.'
+            '(except for geo, mapbox and map) and on-legend double clicks.'
         ].join(' ')
     },
 

src/plots/mapnew/constants.js

@@ -126,7 +126,7 @@ var arcgisSat = {
 
 };
 
-var stylesMapnew = {
+var stylesMap = {
     basic: cartoVoyager,
     streets: cartoVoyager,
     outdoors: cartoVoyager,
@@ -237,28 +237,28 @@ var stylesMapnew = {
     }
 };
 
-var styleValuesMapnew = sortObjectKeys(stylesMapnew);
+var styleValuesMap = sortObjectKeys(stylesMap);
 
 module.exports = {
     requiredVersion: requiredVersion,
 
 
     styleValueDflt: 'basic',
-    stylesMapnew: stylesMapnew,
-    styleValuesMapnew: styleValuesMapnew,
+    stylesMap: stylesMap,
+    styleValuesMap: styleValuesMap,
 
     traceLayerPrefix: 'plotly-trace-layer-',
     layoutLayerPrefix: 'plotly-layout-layer-',
 
 
     missingStyleErrorMsg: [
-        'No valid maplibre style found, please set `mapnew.style` to one of:',
-        styleValuesMapnew.join(', '),
+        'No valid maplibre style found, please set `map.style` to one of:',
+        styleValuesMap.join(', '),
         'or use a tile service.'
     ].join('\n'),
 
 
-    mapOnErrorMsg: 'Mapnew error.',
+    mapOnErrorMsg: 'Map error.',
 
 
 };

src/plots/mapnew/convert_text_opts.js

@@ -3,7 +3,7 @@
 var Lib = require('../../lib');
 
 /**
- * Convert plotly.js 'textposition' to mapnew-gl 'anchor' and 'offset'
+ * Convert plotly.js 'textposition' to map-gl 'anchor' and 'offset'
  * (with the help of the icon size).
  *
  * @param {string} textpostion : plotly.js textposition value
@@ -48,7 +48,7 @@ module.exports = function convertTextOpts(textposition, iconSize) {
             break;
     }
 
-    // Mapnew text-anchor must be one of:
+    // Map text-anchor must be one of:
     //  center, left, right, top, bottom,
     //  top-left, top-right, bottom-left, bottom-right