Use geoblocks/proj and remove ngeo.source.Swisstopo

api/src/Map.js

@@ -8,7 +8,6 @@ import {Icon, Style} from 'ol/style.js';
 import View from 'ol/View.js';
 import VectorSource from 'ol/source/Vector.js';
 import VectorLayer from 'ol/layer/Vector.js';
-import TileLayer from 'ol/layer/Tile.js';
 
 import MousePosition from 'ol/control/MousePosition.js';
 import {createStringXY} from 'ol/coordinate.js';

api/src/Themes.js

@@ -113,7 +113,7 @@ export function getOverlayLayers(layerNames) {
 
 /**
  * @param {Object} config Layer config (i.e. gmf layer node)
- * @param {Object} ogsServer OGC server configuration used to create the layer.
+ * @param {Object} ogcServer OGC server configuration used to create the layer.
  * @return {Promise} Promise.
  */
 export function createWMSLayer(config, ogcServer) {

contribs/gmf/apps/desktop/Controller.js

@@ -11,8 +11,8 @@
 import 'gmf/controllers/desktop.scss';
 import gmfControllersAbstractDesktopController from 'gmf/controllers/AbstractDesktopController.js';
 import appBase from '../appmodule.js';
-import ngeoProjEPSG2056 from 'ngeo/proj/EPSG2056.js';
-import ngeoProjEPSG21781 from 'ngeo/proj/EPSG21781.js';
+import EPSG2056 from '@geoblocks/proj/src/EPSG_2056.js';
+import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import * as olBase from 'ol/index.js';
 import Raven from 'raven-js/src/raven.js';
 import RavenPluginsAngular from 'raven-js/plugins/angular.js';
@@ -46,7 +46,7 @@ const exports = function($scope, $injector) {
    * @type {Array.<string>}
    * @export
    */
-  this.searchCoordinatesProjections = [ngeoProjEPSG21781, ngeoProjEPSG2056, 'EPSG:4326'];
+  this.searchCoordinatesProjections = [EPSG21781, EPSG2056, 'EPSG:4326'];
 
   /**
    * @type {!Array.<number>}
@@ -86,11 +86,11 @@ const exports = function($scope, $injector) {
    * @export
    */
   this.mousePositionProjections = [{
-    code: ngeoProjEPSG2056,
+    code: EPSG2056,
     label: 'CH1903+ / LV95',
     filter: 'ngeoNumberCoordinates::{x}, {y} m'
   }, {
-    code: ngeoProjEPSG21781,
+    code: EPSG21781,
     label: 'CH1903 / LV03',
     filter: 'ngeoNumberCoordinates::{x}, {y} m'
   }, {

contribs/gmf/apps/desktop_alt/Controller.js

@@ -14,8 +14,8 @@ import appBase from '../appmodule.js';
 import gmfImportModule from 'gmf/import/module.js';
 import ngeoGooglestreetviewModule from 'ngeo/googlestreetview/module.js';
 import ngeoRoutingModule from 'ngeo/routing/module.js';
-import ngeoProjEPSG2056 from 'ngeo/proj/EPSG2056.js';
-import ngeoProjEPSG21781 from 'ngeo/proj/EPSG21781.js';
+import EPSG2056 from '@geoblocks/proj/src/EPSG_2056.js';
+import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import ngeoStatemanagerWfsPermalink from 'ngeo/statemanager/WfsPermalink.js';
 import * as olBase from 'ol/index.js';
 import Raven from 'raven-js/src/raven.js';
@@ -53,7 +53,7 @@ const exports = function($scope, $injector, ngeoFile, gettext, $q) {
    * @type {Array.<string>}
    * @export
    */
-  this.searchCoordinatesProjections = [ngeoProjEPSG21781, ngeoProjEPSG2056, 'EPSG:4326'];
+  this.searchCoordinatesProjections = [EPSG21781, EPSG2056, 'EPSG:4326'];
 
   /**
    * @type {number}

contribs/gmf/apps/iframe_api/Controller.js

@@ -11,8 +11,8 @@
 import 'gmf/controllers/iframe_api.scss';
 import gmfControllersAbstractAPIController from 'gmf/controllers/AbstractAPIController.js';
 import appBase from '../appmodule.js';
-import ngeoProjEPSG2056 from 'ngeo/proj/EPSG2056.js';
-import ngeoProjEPSG21781 from 'ngeo/proj/EPSG21781.js';
+import EPSG2056 from '@geoblocks/proj/src/EPSG_2056.js';
+import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import * as olBase from 'ol/index.js';
 import Raven from 'raven-js/src/raven.js';
 import RavenPluginsAngular from 'raven-js/plugins/angular.js';
@@ -42,8 +42,8 @@ const exports = function($scope, $injector) {
     }
   }, $scope, $injector);
 
-  this.ngeoProjEPSG2056 = ngeoProjEPSG2056;
-  this.ngeoProjEPSG21781 = ngeoProjEPSG21781;
+  this.EPSG2056 = EPSG2056;
+  this.EPSG21781 = EPSG21781;
 
   if ($injector.has('sentryUrl')) {
     const options = $injector.has('sentryOptions') ? $injector.get('sentryOptions') : undefined;

contribs/gmf/apps/mobile/Controller.js

@@ -11,8 +11,8 @@
 import gmfControllersAbstractMobileController from 'gmf/controllers/AbstractMobileController.js';
 import 'gmf/controllers/mobile.scss';
 import appBase from '../appmodule.js';
-import ngeoProjEPSG2056 from 'ngeo/proj/EPSG2056.js';
-import ngeoProjEPSG21781 from 'ngeo/proj/EPSG21781.js';
+import EPSG2056 from '@geoblocks/proj/src/EPSG_2056.js';
+import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import * as olBase from 'ol/index.js';
 import Raven from 'raven-js/src/raven.js';
 import RavenPluginsAngular from 'raven-js/plugins/angular.js';
@@ -56,7 +56,7 @@ const exports = function($scope, $injector) {
    * @type {Array.<string>}
    * @export
    */
-  this.searchCoordinatesProjections = [ngeoProjEPSG21781, ngeoProjEPSG2056, 'EPSG:4326'];
+  this.searchCoordinatesProjections = [EPSG21781, EPSG2056, 'EPSG:4326'];
 
   if ($injector.has('sentryUrl')) {
     const options = $injector.has('sentryOptions') ? $injector.get('sentryOptions') : undefined;

contribs/gmf/apps/mobile_alt/Controller.js

@@ -11,8 +11,8 @@
 import gmfControllersAbstractMobileController from 'gmf/controllers/AbstractMobileController.js';
 import './sass/mobile_alt.scss';
 import appBase from '../appmodule.js';
-import ngeoProjEPSG2056 from 'ngeo/proj/EPSG2056.js';
-import ngeoProjEPSG21781 from 'ngeo/proj/EPSG21781.js';
+import EPSG2056 from '@geoblocks/proj/src/EPSG_2056.js';
+import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import * as olBase from 'ol/index.js';
 import olStyleFill from 'ol/style/Fill.js';
 import olStyleRegularShape from 'ol/style/RegularShape.js';
@@ -67,7 +67,7 @@ const exports = function($scope, $injector) {
    * @type {Array.<string>}
    * @export
    */
-  this.searchCoordinatesProjections = [ngeoProjEPSG21781, ngeoProjEPSG2056, 'EPSG:4326'];
+  this.searchCoordinatesProjections = [EPSG21781, EPSG2056, 'EPSG:4326'];
 
 
   /**

contribs/gmf/apps/oeedit/Controller.js

@@ -13,8 +13,8 @@ import './sass/oeedit.scss';
 import appBase from '../appmodule.js';
 import gmfObjecteditingModule from 'gmf/objectediting/module.js';
 import ngeoMiscToolActivate from 'ngeo/misc/ToolActivate.js';
-import ngeoProjEPSG2056 from 'ngeo/proj/EPSG2056.js';
-import ngeoProjEPSG21781 from 'ngeo/proj/EPSG21781.js';
+import EPSG2056 from '@geoblocks/proj/src/EPSG_2056.js';
+import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import * as olBase from 'ol/index.js';
 import olCollection from 'ol/Collection.js';
 import olLayerVector from 'ol/layer/Vector.js';
@@ -155,7 +155,7 @@ const exports = function($scope, $injector, $timeout) {
    * @type {Array.<string>}
    * @export
    */
-  this.searchCoordinatesProjections = [ngeoProjEPSG21781, ngeoProjEPSG2056, 'EPSG:4326'];
+  this.searchCoordinatesProjections = [EPSG21781, EPSG2056, 'EPSG:4326'];
 
   /**
    * @type {!Array.<number>}
@@ -189,11 +189,11 @@ const exports = function($scope, $injector, $timeout) {
    * @export
    */
   this.mousePositionProjections = [{
-    code: ngeoProjEPSG2056,
+    code: EPSG2056,
     label: 'CH1903+ / LV95',
     filter: 'ngeoNumberCoordinates::{x}, {y} m'
   }, {
-    code: ngeoProjEPSG21781,
+    code: EPSG21781,
     label: 'CH1903 / LV03',
     filter: 'ngeoNumberCoordinates::{x}, {y} m'
   }, {

contribs/gmf/apps/oeview/Controller.js

@@ -11,8 +11,8 @@
 import gmfControllersAbstractDesktopController from 'gmf/controllers/AbstractDesktopController.js';
 import './sass/oeview.scss';
 import appBase from '../appmodule.js';
-import ngeoProjEPSG2056 from 'ngeo/proj/EPSG2056.js';
-import ngeoProjEPSG21781 from 'ngeo/proj/EPSG21781.js';
+import EPSG2056 from '@geoblocks/proj/src/EPSG_2056.js';
+import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import * as olBase from 'ol/index.js';
 import Raven from 'raven-js/src/raven.js';
 import RavenPluginsAngular from 'raven-js/plugins/angular.js';
@@ -46,7 +46,7 @@ const exports = function($scope, $injector) {
    * @type {Array.<string>}
    * @export
    */
-  this.searchCoordinatesProjections = [ngeoProjEPSG21781, ngeoProjEPSG2056, 'EPSG:4326'];
+  this.searchCoordinatesProjections = [EPSG21781, EPSG2056, 'EPSG:4326'];
 
   /**
    * @type {!Array.<number>}
@@ -80,11 +80,11 @@ const exports = function($scope, $injector) {
    * @export
    */
   this.mousePositionProjections = [{
-    code: ngeoProjEPSG2056,
+    code: EPSG2056,
     label: 'CH1903+ / LV95',
     filter: 'ngeoNumberCoordinates::{x}, {y} m'
   }, {
-    code: ngeoProjEPSG21781,
+    code: EPSG21781,
     label: 'CH1903 / LV03',
     filter: 'ngeoNumberCoordinates::{x}, {y} m'
   }, {

contribs/gmf/examples/backgroundlayerselector.js

@@ -11,7 +11,7 @@ import gmfBackgroundlayerselectorModule from 'gmf/backgroundlayerselector/module
 import gmfMapComponent from 'gmf/map/component.js';
 
 import gmfThemeThemes from 'gmf/theme/Themes.js';
-import EPSG21781 from 'ngeo/proj/EPSG21781.js';
+import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import olMap from 'ol/Map.js';
 import olView from 'ol/View.js';
 

contribs/gmf/examples/contextualdata.js

@@ -10,7 +10,7 @@ import gmfContextualdataModule from 'gmf/contextualdata/module.js';
 
 import gmfMapComponent from 'gmf/map/component.js';
 import ngeoMiscFilters from 'ngeo/misc/filters.js';
-import EPSG21781 from 'ngeo/proj/EPSG21781.js';
+import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import olMap from 'ol/Map.js';
 import olView from 'ol/View.js';
 import olLayerTile from 'ol/layer/Tile.js';

contribs/gmf/examples/displayquerygrid.js

@@ -19,7 +19,7 @@ import gmfThemeThemes from 'gmf/theme/Themes.js';
 import ngeoGridModule from 'ngeo/grid/module.js';
 import ngeoMapModule from 'ngeo/map/module.js';
 import ngeoMiscBtnComponent from 'ngeo/misc/btnComponent.js';
-import EPSG21781 from 'ngeo/proj/EPSG21781.js';
+import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import ngeoQueryBboxQueryComponent from 'ngeo/query/bboxQueryComponent.js';
 import ngeoQueryMapQueryComponent from 'ngeo/query/mapQueryComponent.js';
 import olMap from 'ol/Map.js';

contribs/gmf/examples/displayquerywindow.js

@@ -17,7 +17,7 @@ import gmfQueryWindowComponent from 'gmf/query/windowComponent.js';
 
 import gmfThemeThemes from 'gmf/theme/Themes.js';
 import ngeoMiscBtnComponent from 'ngeo/misc/btnComponent.js';
-import EPSG21781 from 'ngeo/proj/EPSG21781.js';
+import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import ngeoQueryBboxQueryComponent from 'ngeo/query/bboxQueryComponent.js';
 import ngeoQueryMapQueryComponent from 'ngeo/query/mapQueryComponent.js';
 import olMap from 'ol/Map.js';

contribs/gmf/examples/editfeature.js

@@ -6,7 +6,7 @@ const exports = {};
 import appURL from './url.js';
 import './editfeature.css';
 import 'jquery-ui/ui/widgets/tooltip.js';
-import EPSG21781 from 'ngeo/proj/EPSG21781.js';
+import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 
 import gmfAuthenticationModule from 'gmf/authentication/module.js';
 import gmfEditingEditFeature from 'gmf/editing/EditFeature.js';

contribs/gmf/examples/editfeatureselector.js

@@ -21,7 +21,7 @@ import gmfThemeThemes from 'gmf/theme/Themes.js';
 import ngeoMiscFeatureHelper from 'ngeo/misc/FeatureHelper.js';
 import ngeoMiscToolActivate from 'ngeo/misc/ToolActivate.js';
 import ngeoMiscToolActivateMgr from 'ngeo/misc/ToolActivateMgr.js';
-import EPSG21781 from 'ngeo/proj/EPSG21781.js';
+import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import olCollection from 'ol/Collection.js';
 import olMap from 'ol/Map.js';
 import olView from 'ol/View.js';

contribs/gmf/examples/elevation.js

@@ -9,7 +9,7 @@ import './elevation.css';
 import gmfMapComponent from 'gmf/map/component.js';
 
 import gmfRasterModule from 'gmf/raster/module.js';
-import EPSG21781 from 'ngeo/proj/EPSG21781.js';
+import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import olMap from 'ol/Map.js';
 import olView from 'ol/View.js';
 import olLayerTile from 'ol/layer/Tile.js';

contribs/gmf/examples/filterselector.js

@@ -25,7 +25,7 @@ import ngeoQueryBboxQueryComponent from 'ngeo/query/bboxQueryComponent.js';
 import ngeoQueryMapQueryComponent from 'ngeo/query/mapQueryComponent.js';
 import ngeoMiscToolActivate from 'ngeo/misc/ToolActivate.js';
 import ngeoMiscToolActivateMgr from 'ngeo/misc/ToolActivateMgr.js';
-import EPSG21781 from 'ngeo/proj/EPSG21781.js';
+import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import olMap from 'ol/Map.js';
 import olView from 'ol/View.js';
 import olLayerTile from 'ol/layer/Tile.js';

contribs/gmf/examples/importdatasource.js

@@ -24,7 +24,7 @@ import ngeoDatasourceDataSources from 'ngeo/datasource/DataSources.js';
 import ngeoQueryBboxQueryComponent from 'ngeo/query/bboxQueryComponent.js';
 
 import ngeoQueryMapQueryComponent from 'ngeo/query/mapQueryComponent.js';
-import EPSG21781 from 'ngeo/proj/EPSG21781.js';
+import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import olMap from 'ol/Map.js';
 import olView from 'ol/View.js';
 import olLayerTile from 'ol/layer/Tile.js';

contribs/gmf/examples/layertree.js

@@ -15,7 +15,7 @@ import gmfMapComponent from 'gmf/map/component.js';
 
 import gmfThemeManager from 'gmf/theme/Manager.js';
 import gmfThemeThemes from 'gmf/theme/Themes.js';
-import EPSG21781 from 'ngeo/proj/EPSG21781.js';
+import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import ngeoStatemanagerLocation from 'ngeo/statemanager/Location.js';
 import ngeoLayertreeModule from 'ngeo/layertree/module.js';
 import olMap from 'ol/Map.js';

contribs/gmf/examples/layertreeadd.js

@@ -17,7 +17,7 @@ import gmfMapComponent from 'gmf/map/component.js';
 import gmfThemeThemes from 'gmf/theme/Themes.js';
 
 import gmfThemeManager from 'gmf/theme/Manager.js';
-import EPSG21781 from 'ngeo/proj/EPSG21781.js';
+import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import ngeoStatemanagerLocation from 'ngeo/statemanager/Location.js';
 import olMap from 'ol/Map.js';
 import olView from 'ol/View.js';

contribs/gmf/examples/lidarprofile.js

@@ -6,7 +6,7 @@ const exports = {};
 import './lidarprofile.css';
 import gmfMapComponent from 'gmf/map/component.js';
 import gmfLidarprofileModule from 'gmf/lidarprofile/module.js';
-import EPSG2056 from 'ngeo/proj/EPSG2056.js';
+import EPSG2056 from '@geoblocks/proj/src/EPSG_2056.js';
 import ngeoMapModule from 'ngeo/map/module.js';
 import olMap from 'ol/Map.js';
 import olView from 'ol/View.js';

contribs/gmf/examples/mobilemeasure.js

@@ -14,7 +14,7 @@ import gmfPermalinkPermalink from 'gmf/permalink/Permalink.js';
 import gmfMobileMeasureLengthComponent from 'gmf/mobile/measure/lengthComponent.js';
 import gmfMobileMeasurePointComponent from 'gmf/mobile/measure/pointComponent.js';
 import ngeoMiscBtnComponent from 'ngeo/misc/btnComponent.js';
-import EPSG21781 from 'ngeo/proj/EPSG21781.js';
+import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import olMap from 'ol/Map.js';
 import olView from 'ol/View.js';
 import olControlScaleLine from 'ol/control/ScaleLine.js';

contribs/gmf/examples/mouseposition.js

@@ -7,8 +7,8 @@ import './mouseposition.css';
 /** @suppress {extraRequire} */
 import gmfMapModule from 'gmf/map/module.js';
 
-import EPSG2056 from 'ngeo/proj/EPSG2056.js';
-import EPSG21781 from 'ngeo/proj/EPSG21781.js';
+import EPSG2056 from '@geoblocks/proj/src/EPSG_2056.js';
+import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import olMap from 'ol/Map.js';
 import olView from 'ol/View.js';
 import olLayerTile from 'ol/layer/Tile.js';

contribs/gmf/examples/objectediting.js

@@ -19,7 +19,7 @@ import gmfObjecteditingManager from 'gmf/objectediting/Manager.js';
 import gmfThemeThemes from 'gmf/theme/Themes.js';
 import ngeoMiscToolActivate from 'ngeo/misc/ToolActivate.js';
 import ngeoMiscToolActivateMgr from 'ngeo/misc/ToolActivateMgr.js';
-import EPSG21781 from 'ngeo/proj/EPSG21781.js';
+import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import * as olProj from 'ol/proj.js';
 import olCollection from 'ol/Collection.js';
 import olMap from 'ol/Map.js';

contribs/gmf/examples/permalink.js

@@ -7,7 +7,7 @@ import './permalink.css';
 /** @suppress {extraRequire} */
 import gmfMapModule from 'gmf/map/module.js';
 
-import EPSG21781 from 'ngeo/proj/EPSG21781.js';
+import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import olMap from 'ol/Map.js';
 import olView from 'ol/View.js';
 import olLayerTile from 'ol/layer/Tile.js';

contribs/gmf/examples/print.js

@@ -15,7 +15,7 @@ import gmfPrintComponent from 'gmf/print/component.js';
 
 import gmfThemeThemes from 'gmf/theme/Themes.js';
 import ngeoMapModule from 'ngeo/map/module.js';
-import EPSG21781 from 'ngeo/proj/EPSG21781.js';
+import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import olMap from 'ol/Map.js';
 import olView from 'ol/View.js';
 import olLayerTile from 'ol/layer/Tile.js';

contribs/gmf/examples/profile.js

@@ -13,7 +13,7 @@ import gmfMapComponent from 'gmf/map/component.js';
 
 import gmfProfileModule from 'gmf/profile/module.js';
 import ngeoMapModule from 'ngeo/map/module.js';
-import EPSG21781 from 'ngeo/proj/EPSG21781.js';
+import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import olCollection from 'ol/Collection.js';
 import olMap from 'ol/Map.js';
 import olView from 'ol/View.js';

contribs/gmf/examples/search.js

@@ -12,7 +12,7 @@ import gmfSearchModule from 'gmf/search/module.js';
 import gmfThemeThemes from 'gmf/theme/Themes.js';
 import ngeoMessageNotification from 'ngeo/message/Notification.js';
 import ngeoMessageMessage from 'ngeo/message/Message.js';
-import EPSG21781 from 'ngeo/proj/EPSG21781.js';
+import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import ngeoMapModule from 'ngeo/map/module.js';
 import olMap from 'ol/Map.js';
 import olView from 'ol/View.js';

contribs/gmf/examples/wfspermalink.js

@@ -12,7 +12,7 @@ import gmfMapModule from 'gmf/map/module.js';
 import gmfQueryWindowComponent from 'gmf/query/windowComponent.js';
 import ngeoStatemanagerWfsPermalink from 'ngeo/statemanager/WfsPermalink.js';
 
-import EPSG21781 from 'ngeo/proj/EPSG21781.js';
+import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import olMap from 'ol/Map.js';
 import olView from 'ol/View.js';
 import olLayerTile from 'ol/layer/Tile.js';