refactor: move files, merge module

spraakbanken · Sep 12, 2024 · d05456e · d05456e
1 parent 21b5168
commit d05456e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/app/scripts/components/dynamic_tabs/map-tabs.js b/app/scripts/components/dynamic_tabs/map-tabs.js
@@ -2,6 +2,7 @@
 import angular from "angular"
 import { html } from "@/util"
 import "@/components/korp-error"
+import "@/components/result-map"
 import "@/directives/tab-spinner"
 
 angular.module("korpApp").directive("mapTabs", () => ({
@@ -36,14 +37,14 @@ angular.module("korpApp").directive("mapTabs", () => ({
                             >
                         </div>
                     </div>
-                    <sb-map
+                    <result-map
                         center="center"
                         markers="markerGroups"
                         marker-callback="newKWICSearch"
                         selected-groups="selectedGroups"
                         rest-color="restColor"
                         use-clustering="useClustering"
-                    ></sb-map>
+                    ></result-map>
                 </div>
             </div>
         </uib-tab>

diff --git a/app/scripts/geo/geokorp.js → app/scripts/components/result-map.js b/app/scripts/geo/geokorp.js → app/scripts/components/result-map.js
@@ -2,11 +2,7 @@
 import angular from "angular"
 import L, { Map } from "leaflet"
 import { html } from "@/util"
-import "./geokorp.scss"
-
-const sbMap = angular.module("sbMap", [])
-
-sbMap.filter("trust", ($sce) => (input) => $sce.trustAsHtml(input))
+import "@/../styles/map.scss"
 
 /**
  * @typedef SbMapScope
@@ -22,7 +18,7 @@ sbMap.filter("trust", ($sce) => (input) => $sce.trustAsHtml(input))
  * @prop {string} color
  */
 
-sbMap.component("sbMap", {
+angular.module("korpApp").component("resultMap", {
     template: html`<div class="map">
         <div class="map-outer-container" ng-show="showMap">
             <div class="map-container"></div>

diff --git a/app/scripts/korp.module.ts b/app/scripts/korp.module.ts
@@ -3,7 +3,6 @@ import angular from "angular"
 import "angular-ui-bootstrap"
 import "angular-spinner"
 import "angular-ui-sortable"
-import "@/geo/geokorp"
 import "angular-dynamic-locale"
 import "angular-filter"
 
@@ -35,7 +34,6 @@ const korpApp = angular.module("korpApp", [
     "uib/template/popover/popover-template.html",
     "angularSpinner",
     "ui.sortable",
-    "sbMap",
     "tmh.dynamicLocale",
     "angular.filter",
 ])

diff --git a/app/scripts/geo/geokorp.scss → app/styles/map.scss b/app/scripts/geo/geokorp.scss → app/styles/map.scss
@@ -1,4 +1,4 @@
-sb-map {
+result-map {
   padding: 8px;
 
   .leaflet-div-icon {