Skip to content

Commit

Permalink
Merge pull request #3054 from camptocamp/desktop_alt-remove-old-impor…
Browse files Browse the repository at this point in the history
…t-layer

Remove legacy ImportLayer from desktop_alt
  • Loading branch information
adube committed Nov 3, 2017
2 parents 741e3e7 + fefd050 commit 861c6d9
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 38 deletions.
31 changes: 0 additions & 31 deletions contribs/gmf/apps/desktop_alt/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@
</div>
</header>
<main>
<div
ngeo-import-dnd
ngeo-import-dnd-options="::mainCtrl.importOptions">
</div>

<div class="gmf-app-data-panel">
<div class="gmf-app-header">
<div class="dropdown">
Expand All @@ -37,32 +32,6 @@
<span translate>Themes</span>
<span class="caret"></span>
</a>
<div class="import">
<div>Local</div>
<div class="import-local"
ngeo-import-local
ngeo-import-local-options="::mainCtrl.importOptions">
</div>
<div>Online</div>
<div
ngeo-import-online
ngeo-import-online-options="::mainCtrl.importOptions">
</div>

<!-- Display WMS GetCapabilities results -->
<div ng-if="wmsGetCap"
ngeo-wms-get-cap="wmsGetCap"
ngeo-wms-get-cap-map="::map"
ngeo-wms-get-cap-options="::mainCtrl.importOptions">
</div>

<!-- Display WMTS GetCapabilities results -->
<div ng-if="wmtsGetCap"
ngeo-wmts-get-cap="wmtsGetCap"
ngeo-wmts-get-cap-map="::map"
ngeo-wmts-get-cap-options="::mainCtrl.importOptions">
</div>
</div>
<gmf-themeselector class="dropdown-menu"
gmf-themeselector-currenttheme="mainCtrl.theme"
gmf-themeselector-filter="::mainCtrl.filter">
Expand Down
7 changes: 0 additions & 7 deletions contribs/gmf/apps/desktop_alt/js/controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ goog.require('ngeo.proj.EPSG2056');
/** @suppress {extraRequire} */
goog.require('ngeo.proj.EPSG21781');

goog.require('app.GmfImportHelper');


gmf.module.value('ngeoQueryOptions', {
'limit': 20,
Expand Down Expand Up @@ -131,11 +129,6 @@ app.AlternativeDesktopController = function($scope, $injector, ngeoFile, gettext
gettextCatalog.getString('Add a theme');
gettextCatalog.getString('Add a sub theme');
gettextCatalog.getString('Add a layer');

/**
* @export
*/
this.importOptions = new app.GmfImportHelper(this.map, $scope, gettext, ngeoFile, $q).createOptions();
};
ol.inherits(app.AlternativeDesktopController, gmf.AbstractDesktopController);

Expand Down

0 comments on commit 861c6d9

Please sign in to comment.