Revert "Formatting"

This reverts commit 81bb0d0.
geoadmin · Jul 3, 2023 · ce787c5 · ce787c5
1 parent 970c71b
commit ce787c5
Show file tree

Hide file tree

Showing 20 changed files with 3,207 additions and 3,301 deletions.
diff --git a/package.json b/package.json
@@ -18,9 +18,7 @@
         "test:e2e:ci:prod": "npm run test:e2e:ci",
         "test:ci": "npm run test:unit && npm run test:e2e:ci",
         "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
-        "format": "prettier --write src",
-	"format-lint": "npm run format && npm run lint",
-	"type-check": "vue-tsc --noEmit -p tsconfig.vitest.json --composite false",
+        "type-check": "vue-tsc --noEmit -p tsconfig.vitest.json --composite false",
         "build": "npm run type-check && vite build",
         "build:dev": "npm run build -- --mode development",
         "build:int": "npm run build -- --mode integration",

diff --git a/src/config.js b/src/config.js
@@ -194,7 +194,7 @@ export const TILEGRID_RESOLUTIONS = [
  * Caveat: setting resolution (mininum and maximum) has the precedence over zoom (minimum/maximum)
  */
 
-export const VIEW_MIN_RESOLUTION = 0.1 // meters/pixel
+export const VIEW_MIN_RESOLUTION = 0.1  // meters/pixel
 
 /**
  * Array of coordinates with bottom left / top right values of the extent. This can be used to

diff --git a/src/modules/i18n/locales/de.json b/src/modules/i18n/locales/de.json
diff --git a/src/modules/i18n/locales/en.json b/src/modules/i18n/locales/en.json
diff --git a/src/modules/i18n/locales/fr.json b/src/modules/i18n/locales/fr.json
diff --git a/src/modules/i18n/locales/it.json b/src/modules/i18n/locales/it.json
diff --git a/src/modules/i18n/locales/rm.json b/src/modules/i18n/locales/rm.json
diff --git a/src/modules/map/components/footer/MapFooterBackgroundSelector.vue b/src/modules/map/components/footer/MapFooterBackgroundSelector.vue
@@ -250,7 +250,7 @@ $numberOfBackgrounds: 3;
         &.bg-ch-swisstopo-swissimage {
             background-position: 0 0;
         }
-        &.bg-ch-swisstopo-pixelkarte-grau {
+        &.bg-ch-swisstopo-pixelkarte-grau{
             background-position: -98.6667px 0; // 96px (image) + 2.6667 (border)
         }
         &.bg-ch-swisstopo-pixelkarte-farbe {

diff --git a/src/modules/map/components/openlayers/OpenLayersMap.vue b/src/modules/map/components/openlayers/OpenLayersMap.vue
@@ -104,12 +104,8 @@
 import { EditableFeatureTypes, LayerFeature } from '@/api/features.api'
 import LayerTypes from '@/api/layers/LayerTypes.enum'
 
-import {
-    IS_TESTING_WITH_CYPRESS,
-    VECTOR_LIGHT_BASE_MAP_STYLE_ID,
-    VIEW_MIN_RESOLUTION,
-} from '@/config'
-import { extractOlFeatureGeodesicCoordinates } from '@/modules/drawing/lib/drawingUtils'
+import { IS_TESTING_WITH_CYPRESS, VECTOR_LIGHT_BASE_MAP_STYLE_ID, VIEW_MIN_RESOLUTION } from '@/config'
+import { extractOlFeatureGeodesicCoordinates } from "@/modules/drawing/lib/drawingUtils";
 import FeatureEdit from '@/modules/infobox/components/FeatureEdit.vue'
 import FeatureList from '@/modules/infobox/components/FeatureList.vue'
 import OpenLayersPopover from '@/modules/map/components/openlayers/OpenLayersPopover.vue'
@@ -368,6 +364,7 @@ export default {
         this.map.on('singleclick', this.onMapSingleClick)
         this.map.on('pointerdrag', this.onMapPointerDrag)
         this.map.on('moveend', this.onMapMoveEnd)
+
     },
     unmounted() {
         this.map.un('pointerdown', this.onMapPointerDown)
@@ -416,8 +413,7 @@ export default {
                     .forEach((feature) => {
                         const editableFeature = feature.get('editableFeature')
                         if (editableFeature) {
-                            editableFeature.geodesicCoordinates =
-                                extractOlFeatureGeodesicCoordinates(feature)
+                            editableFeature.geodesicCoordinates = extractOlFeatureGeodesicCoordinates(feature)
                             features.push(editableFeature)
                         } else {
                             log.debug(

diff --git a/src/modules/menu/components/menu/MenuSettings.vue b/src/modules/menu/components/menu/MenuSettings.vue
@@ -4,7 +4,7 @@
             <LangSwitchToolbar />
         </div>
         <div id="menu-feedback">
-            <FeedbackToolbar />
+             <FeedbackToolbar />
         </div>
     </div>
 </template>

diff --git a/src/modules/menu/components/menu/feedback/FeedbackToolbar.vue b/src/modules/menu/components/menu/feedback/FeedbackToolbar.vue
@@ -23,7 +23,7 @@ export default {
         showAsLinks: {
             type: Boolean,
             default: false,
-        },
-    },
+        }
+    }
 }
 </script>
diff --git a/src/modules/menu/components/search/SearchBar.vue b/src/modules/menu/components/search/SearchBar.vue
@@ -96,17 +96,18 @@ export default {
 @import 'src/scss/media-query.mixin';
 
 .search-bar-input {
-    font-size: 0.825rem;
+    font-size: 0.825rem;;
 }
 
 .search-bar {
     &:focus-within > span.input-group-text {
-        display: none;
+        display:none
     }
     @include respond-above(phone) {
-        &:focus-within > span.input-group-text {
+        &:focus-within > span.input-group-text{
             display: flex;
         }
     }
 }
+
 </style>
diff --git a/src/modules/menu/scss/topics-image.scss b/src/modules/menu/scss/topics-image.scss
@@ -1,145 +1,49 @@
 $topics: (
-    (
-        key: blw,
-        position: 0 0,
-    ),
-    (
-        key: kgs,
-        position: 0 -60px,
-    ),
-    (
-        key: sachplan,
-        position: 0 -120px,
-    ),
-    (
-        key: vu,
-        position: 0 -180px,
-    ),
-    (
-        key: ech,
-        position: 0 -240px,
-    ),
-    (
-        key: schneesport,
-        position: 0 -300px,
-    ),
-    (
-        key: emapis,
-        position: 0 -360px,
-    ),
-    (
-        key: notruf,
-        position: 0 -420px,
-    ),
-    (
-        key: are,
-        position: -110px 0,
-    ),
-    (
-        key: funksender,
-        position: -110px -60px,
-    ),
-    (
-        key: geol,
-        position: -110px -120px,
-    ),
-    (
-        key: aviation,
-        position: -110px -180px,
-    ),
-    (
-        key: verteidigung,
-        position: -110px -240px,
-    ),
-    (
-        key: energie,
-        position: -110px -300px,
-    ),
-    (
-        key: geodesy,
-        position: -110px -360px,
-    ),
-    (
-        key: schule,
-        position: -110px -420px,
-    ),
-    (
-        key: bafu,
-        position: -220px 0,
-    ),
-    (
-        key: nga,
-        position: -220px -60px,
-    ),
-    (
-        key: luftbilder,
-        position: -220px -120px,
-    ),
-    (
-        key: gewiss,
-        position: -220px -180px,
-    ),
-    (
-        key: dev,
-        position: -220px -240px,
-    ),
-    (
-        key: cadastre,
-        position: -220px -300px,
-    ),
-    (
-        key: meteoschweiz,
-        position: -220px -360px,
-    ),
-    (
-        key: isos,
-        position: -220px -420px,
-    ),
-    (
-        key: swisstopo,
-        position: -330px 0,
-    ),
-    (
-        key: ivs,
-        position: -330px -60px,
-    ),
-    (
-        key: wildruhezonen,
-        position: -330px -120px,
-    ),
-    (
-        key: inspire,
-        position: -330px -180px,
-    ),
-    (
-        key: geothermie,
-        position: -330px -240px,
-    ),
-    (
-        key: astra,
-        position: -330px -300px,
-    ),
-    (
-        key: bfs,
-        position: -330px -360px,
-    ),
-    (
-        key: bav,
-        position: -330px -420px,
-    )
+  (key: blw,           position: 0 0),
+  (key: kgs,           position: 0 -60px),
+  (key: sachplan,      position: 0 -120px),
+  (key: vu,            position: 0 -180px),
+  (key: ech,           position: 0 -240px),
+  (key: schneesport,   position: 0 -300px),
+  (key: emapis,        position: 0 -360px),
+  (key: notruf,        position: 0 -420px),
+  (key: are,           position: -110px 0),
+  (key: funksender,    position: -110px -60px),
+  (key: geol,          position: -110px -120px),
+  (key: aviation,      position: -110px -180px),
+  (key: verteidigung,  position: -110px -240px),
+  (key: energie,       position: -110px -300px),
+  (key: geodesy,       position: -110px -360px),
+  (key: schule,        position: -110px -420px),
+  (key: bafu,          position: -220px 0),
+  (key: nga,           position: -220px -60px),
+  (key: luftbilder,    position: -220px -120px),
+  (key: gewiss,        position: -220px -180px),
+  (key: dev,           position: -220px -240px),
+  (key: cadastre,      position: -220px -300px),
+  (key: meteoschweiz,  position: -220px -360px),
+  (key: isos,          position: -220px -420px),
+  (key: swisstopo,     position: -330px 0),
+  (key: ivs,           position: -330px -60px),
+  (key: wildruhezonen, position: -330px -120px),
+  (key: inspire,       position: -330px -180px),
+  (key: geothermie,    position: -330px -240px),
+  (key: astra,         position: -330px -300px),
+  (key: bfs,           position: -330px -360px),
+  (key: bav,           position: -330px -420px),
 );
 
 .topics-sprite {
-    margin-left: auto;
-    margin-right: auto;
-    width: 107px;
-    height: 57px;
-    background: url(../../assets/topics.png);
-    cursor: pointer;
+  margin-left: auto;
+  margin-right: auto;
+  width: 107px;
+  height: 57px;
+  background: url(../../assets/topics.png);
+  cursor: pointer;
 }
 
 @each $topic in $topics {
-    .topics-sprite-#{map-get($topic, 'key')} {
-        background-position: map-get($topic, 'position');
-    }
+  .topics-sprite-#{map-get($topic, 'key')} {
+    background-position: map-get($topic, 'position');
+  }
 }
diff --git a/src/router/storeSync/__tests__/layersParamParser.spec.js b/src/router/storeSync/__tests__/layersParamParser.spec.js
@@ -1,4 +1,4 @@
-import ExternalWMTSLayer from '@/api/layers/ExternalWMTSLayer.class'
+import ExternalWMTSLayer from "@/api/layers/ExternalWMTSLayer.class";
 import layersParamParser from '@/router/storeSync/layersParamParser'
 import { expect } from 'chai'
 import { describe, it } from 'vitest'
@@ -69,7 +69,7 @@ describe('Testing layersParamParser', () => {
             {
                 id: 'WMTS|https://totally.fake.wmts.url/WMTSGetCapabilties.xml|a.layer.id|A name for the external WMTS layer',
                 opacity: 0.8,
-            },
+            }
         ]
         // building query string
         let queryString = ''
@@ -166,8 +166,7 @@ describe('Testing layersParamParser', () => {
             expect(layer.opacity).to.eq(0.6)
         })
         it('parses an external WMTS layer correctly', () => {
-            const externalLayerIdInUrl =
-                'WMTS|https://fake.wmts.admin.ch|some_fake_layer_id|Fake WMTS Layer'
+            const externalLayerIdInUrl = 'WMTS|https://fake.wmts.admin.ch|some_fake_layer_id|Fake WMTS Layer'
             const results = layersParamParser(`${externalLayerIdInUrl},t,1.0`)
             expect(results).to.be.an('Array').length(1)
             const [externalWMTSLayer] = results
@@ -177,8 +176,7 @@ describe('Testing layersParamParser', () => {
             expect(externalWMTSLayer.opacity).to.eq(1.0)
         })
         it('parses an external WMS layer correctly', () => {
-            const externalLayerIdInUrl =
-                'WMS|https://fake.wms.admin.ch|some_fake_layer_id|0.0.0|Fake WMS Layer'
+            const externalLayerIdInUrl = 'WMS|https://fake.wms.admin.ch|some_fake_layer_id|0.0.0|Fake WMS Layer'
             const results = layersParamParser(`${externalLayerIdInUrl},t,0.8`)
             expect(results).to.be.an('Array').length(1)
             const [externalWMSLayer] = results