refactor: simplify regex #442

teritorio · Dec 16, 2024 · e19d0d3 · e19d0d3
1 parent 8928d34
commit e19d0d3
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/components/Fields/Field.vue b/components/Fields/Field.vue
@@ -314,7 +314,7 @@ export default defineNuxtComponent({
         "
         :href="properties[field.field]"
         class="d-inline-block pa-2 rounded-lg"
-        :style="{ color: '#ffffff' }"
+        :style="{ backgroundColor: colorfill, color: '#ffffff' }"
       >
         <FontAwesomeIcon icon="arrow-circle-down" />
         {{ fieldTranslateK(field.field) }}

diff --git a/pages/embedded.vue b/pages/embedded.vue
@@ -22,7 +22,7 @@ const { $trackingInit } = useNuxtApp()
 const boundaryGeojson = ref<Polygon | MultiPolygon>()
 const poiId = ref<string>()
 const categoryIds = ref<number[]>()
-const categoryIdsRegex = /^(?:(?<cartocode>cartocode:[a-zA-Z0-9]{2})|(?<reference>ref:[a-z0-9-]+:[a-zA-Z0-9]+)|(?<osm>osm:[nwr]\d+)|\d+(?:,\d+)*)$/
+const categoryIdsRegex = /^(?:(?<cartocode>cartocode:\w{2})|(?<reference>ref:[\w-]+:\w+)|(?<osm>osm:[nwr]\d+)|\d+(?:,\d+)*)$/
 
 //
 // Hooks

diff --git a/pages/embedded/[p1]/[poiId].vue b/pages/embedded/[p1]/[poiId].vue
@@ -4,8 +4,8 @@
 //
 definePageMeta({
   validate: ({ params }) => {
-    const regexForCategoryIds = /^(?:(?<cartocode>cartocode:[a-zA-Z0-9]{2})|(?<reference>ref:[a-z0-9-]+:[a-zA-Z0-9]+)|(?<osm>osm:[nwr]\d+)|\d+(?:,\d+)*)$/
-    const regexForPOIIds = /^(?:cartocode:[a-zA-Z0-9]{2}|ref:[a-z0-9-]+:[a-zA-Z0-9]+|osm:[nwr]\d+|\d+)$/
+    const regexForCategoryIds = /^(?:(?<cartocode>cartocode:\w{2})|(?<reference>ref:[\w-]+:\w+)|(?<osm>osm:[nwr]\d+)|\d+(?:,\d+)*)$/
+    const regexForPOIIds = /^(?:cartocode:\w{2}|ref:[\w-]+:\w+|osm:[nwr]\d+|\d+)$/
     const match = params.p1.toString().match(regexForCategoryIds)
 
     if (match?.groups && (match.groups.cartocode || match.groups.reference || match.groups.osm)) {

diff --git a/pages/embedded/[p1]/index.vue b/pages/embedded/[p1]/index.vue
@@ -4,7 +4,7 @@
 //
 definePageMeta({
   validate: ({ params }) => {
-    const regexForIds = /^(?:cartocode:[a-zA-Z0-9]{2}|ref:[a-z0-9-]+:[a-zA-Z0-9]+|osm:[nwr]\d+|\d+(?:,\d+)*)$/
+    const regexForIds = /^(?:cartocode:\w{2}|ref:[\w-]+:\w+|osm:[nwr]\d+|\d+(?:,\d+)*)$/
 
     return regexForIds.test(params.p1.toString())
   },

diff --git a/pages/index.vue b/pages/index.vue
@@ -22,7 +22,7 @@ const { $trackingInit } = useNuxtApp()
 const boundaryGeojson = ref<Polygon | MultiPolygon>()
 const poiId = ref<string>()
 const categoryIds = ref<number[]>()
-const categoryIdsRegex = /^(?:(?<cartocode>cartocode:[a-zA-Z0-9]{2})|(?<reference>ref:[a-z0-9-]+:[a-zA-Z0-9]+)|(?<osm>osm:[nwr]\d+)|\d+(?:,\d+)*)$/
+const categoryIdsRegex = /^(?:(?<cartocode>cartocode:\w{2})|(?<reference>ref:[\w-]+:\w+)|(?<osm>osm:[nwr]\d+)|\d+(?:,\d+)*)$/
 
 //
 // Hooks

diff --git a/pages/index/[p1]/[poiId].vue b/pages/index/[p1]/[poiId].vue
@@ -4,8 +4,8 @@
 //
 definePageMeta({
   validate: ({ params }) => {
-    const regexForCategoryIds = /^(?:(?<cartocode>cartocode:[a-zA-Z0-9]{2})|(?<reference>ref:[a-z0-9-]+:[a-zA-Z0-9]+)|(?<osm>osm:[nwr]\d+)|\d+(?:,\d+)*)$/
-    const regexForPOIIds = /^(?:cartocode:[a-zA-Z0-9]{2}|ref:[a-z0-9-]+:[a-zA-Z0-9]+|osm:[nwr]\d+|\d+)$/
+    const regexForCategoryIds = /^(?:(?<cartocode>cartocode:\w{2})|(?<reference>ref:[\w-]+:\w+)|(?<osm>osm:[nwr]\d+)|\d+(?:,\d+)*)$/
+    const regexForPOIIds = /^(?:cartocode:\w{2}|ref:[\w-]+:\w+|osm:[nwr]\d+|\d+)$/
     const match = params.p1.toString().match(regexForCategoryIds)
 
     if (match?.groups && (match.groups.cartocode || match.groups.reference || match.groups.osm)) {

diff --git a/pages/index/[p1]/index.vue b/pages/index/[p1]/index.vue
@@ -4,7 +4,7 @@
 //
 definePageMeta({
   validate: ({ params }) => {
-    const regexForIds = /^(?:cartocode:[a-zA-Z0-9]{2}|ref:[a-z0-9-]+:[a-zA-Z0-9]+|osm:[nwr]\d+|\d+(?:,\d+)*)$/
+    const regexForIds = /^(?:cartocode:\w{2}|ref:[\w-]+:\w+|osm:[nwr]\d+|\d+(?:,\d+)*)$/
 
     return regexForIds.test(params.p1.toString())
   },