@lblod/ember-rdfa-editor-lblod-plugins 32.4.1 → 32.5.0-dev.e43d6dc46e0ca0a9cbcfb4bdd58985927f840af9

package/.changeset/unlucky-camels-fail.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': patch
+---
+
+Improve sorting of label filters on 'insert traffic measure' modal

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 32.5.0
+
+### Minor Changes
+
+- [#590](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/590) [`beb01f5`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/beb01f573a2bf1ce42852e7ddb972a4ca01bf724) Thanks [@elpoelma](https://github.com/elpoelma)! - Rename `traffic-sign` to `traffic-signal`
+
 ## 32.4.1
 
 ### Patch Changes

package/addon/components/roadsign-regulation-plugin/roadsigns-modal.gts

@@ -13,12 +13,14 @@ import {
   queryMobilityMeasures,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/queries/mobility-measure-concept';
 import queryRoadSignCategories from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/queries/road-sign-category';
-import querySignCodes from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/queries/sign-codes';
+import queryTrafficSignalCodes from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/queries/traffic-signal-codes';
 import { MobilityMeasureConcept } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/schemas/mobility-measure-concept';
 import { pagination } from '@lblod/ember-rdfa-editor-lblod-plugins/helpers/pagination';
 import { restartableTask, task, timeout } from 'ember-concurrency';
 import t from 'ember-intl/helpers/t';
-import PowerSelect from 'ember-power-select/components/power-select';
+import PowerSelect, {
+  Select,
+} from 'ember-power-select/components/power-select';
 import PowerSelectMultiple from 'ember-power-select/components/power-select-multiple';
 import { TaskInstance, trackedTask } from 'reactiveweb/ember-concurrency';
 import { trackedFunction } from 'reactiveweb/function';
@@ -27,7 +29,7 @@ import PaginationView from '../pagination/pagination-view';
 import { not, or } from 'ember-truth-helpers';
 import { on } from '@ember/modifier';
 import {
-  SIGN_CONCEPT_TYPES,
+  TRAFFIC_SIGNAL_CONCEPT_TYPES,
   ZONALITY_OPTIONS,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
 import { resolveTemplate } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/actions/resolve-template';
@@ -104,9 +106,9 @@ export default class RoadsignsModal extends Component<Signature> {
       this.selectedCategory = undefined;
     } else {
       if (
-        (this.signConceptTypes.map((type) => type.uri) as string[]).includes(
-          option.uri,
-        )
+        (
+          this.trafficSignalConceptTypes.map((type) => type.uri) as string[]
+        ).includes(option.uri)
       ) {
         this.selectedType = option;
         this.selectedCategory = undefined;
@@ -150,6 +152,18 @@ export default class RoadsignsModal extends Component<Signature> {
     this.args.closeModal();
   }
 
+  @action
+  doFirstCodeSearch(select: Select) {
+    if (
+      this.searchCodes.isIdle &&
+      !select.searchText &&
+      // @ts-expect-error not part of the public API... (tested on PS 7 and 8)
+      this.searchCodes.lastSuccessful?.args?.[0] !== ''
+    ) {
+      this.searchCodes.perform('');
+    }
+    return true;
+  }
   searchCodes = restartableTask(async (term: string) => {
     const category = this.selectedCategory?.uri;
     const type = this.selectedType?.label;
@@ -157,7 +171,7 @@ export default class RoadsignsModal extends Component<Signature> {
     await timeout(DEBOUNCE_MS);
     const abortController = new AbortController();
     try {
-      return querySignCodes(this.endpoint, {
+      return queryTrafficSignalCodes(this.endpoint, {
         searchString: term,
         roadSignCategory: category,
         types,
@@ -174,12 +188,15 @@ export default class RoadsignsModal extends Component<Signature> {
     if (!selectedCode) {
       return [];
     }
-    let signs: string[] = [selectedCode.uri];
+    let combinedWith: string[] = [selectedCode.uri];
     if (this.selectedCodeCombination) {
-      signs = [...signs, ...this.selectedCodeCombination.map((s) => s.uri)];
+      combinedWith = [
+        ...combinedWith,
+        ...this.selectedCodeCombination.map((s) => s.uri),
+      ];
     }
-    return querySignCodes(this.endpoint, {
-      combinedWith: signs,
+    return queryTrafficSignalCodes(this.endpoint, {
+      combinedWith,
     });
   });
 
@@ -195,18 +212,18 @@ export default class RoadsignsModal extends Component<Signature> {
     return this.classificationsQuery.value ?? [];
   }
 
-  signConceptTypes = [
+  trafficSignalConceptTypes = [
     {
       label: 'Verkeersborden',
-      uri: SIGN_CONCEPT_TYPES.ROAD_SIGN,
+      uri: TRAFFIC_SIGNAL_CONCEPT_TYPES.ROAD_SIGN,
     },
     {
       label: 'Wegmarkeringen',
-      uri: SIGN_CONCEPT_TYPES.ROAD_MARKING,
+      uri: TRAFFIC_SIGNAL_CONCEPT_TYPES.ROAD_MARKING,
     },
     {
       label: 'Verkeerslichten',
-      uri: SIGN_CONCEPT_TYPES.TRAFFIC_LIGHT,
+      uri: TRAFFIC_SIGNAL_CONCEPT_TYPES.TRAFFIC_LIGHT,
     },
   ];
 
@@ -217,7 +234,7 @@ export default class RoadsignsModal extends Component<Signature> {
     return [
       {
         groupName: 'Types',
-        options: this.signConceptTypes,
+        options: this.trafficSignalConceptTypes,
       },
       {
         groupName: 'Categorieën',
@@ -398,9 +415,11 @@ export default class RoadsignsModal extends Component<Signature> {
                   @verticalPosition='below'
                   @searchEnabled={{true}}
                   @search={{this.searchCodes.perform}}
+                  @options={{or this.searchCodes.last.value undefined}}
                   @selected={{this.selectedCode}}
                   @allowClear={{true}}
                   @onChange={{this.changeCode}}
+                  @onOpen={{this.doFirstCodeSearch}}
                   as |option|
                 >
                   {{option.label}}

package/addon/components/roadsign-regulation-plugin/roadsigns-table.gts

@@ -19,7 +19,7 @@ import { eq } from 'ember-truth-helpers';
 import t from 'ember-intl/helpers/t';
 import { on } from '@ember/modifier';
 import { fn } from '@ember/helper';
-import { SIGN_CONCEPT_TYPES } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
+import { TRAFFIC_SIGNAL_CONCEPT_TYPES } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
 
 type Signature = {
   Args: {
@@ -44,9 +44,9 @@ export default class RoadSignsTable extends Component<Signature> {
 
   categories = (measureConcept: MobilityMeasureConcept) => {
     const categorySet: Set<string> = new Set();
-    for (const signConcept of measureConcept.signConcepts) {
-      if (signConcept.type === SIGN_CONCEPT_TYPES.ROAD_SIGN) {
-        const categoryLabels = signConcept.categories.map((cat) => cat.label);
+    for (const signalConcept of measureConcept.trafficSignalConcepts) {
+      if (signalConcept.type === TRAFFIC_SIGNAL_CONCEPT_TYPES.ROAD_SIGN) {
+        const categoryLabels = signalConcept.categories.map((cat) => cat.label);
         addAll(categorySet, ...categoryLabels);
       }
     }
@@ -94,13 +94,16 @@ export default class RoadSignsTable extends Component<Signature> {
                   </td>
                   <td>
                     <div class='au-o-grid au-o-grid--tiny'>
-                      {{#each measureConcept.signConcepts as |signConcept|}}
+                      {{#each
+                        measureConcept.trafficSignalConcepts
+                        as |signalConcept|
+                      }}
                         <div class='au-o-grid__item au-u-1-3'>
                           <img
-                            src={{signConcept.image}}
+                            src={{signalConcept.image}}
                             alt={{t
                               'editor-plugins.roadsign-regulation.table.content.image.alt'
-                              code=signConcept.code
+                              code=signalConcept.code
                             }}
                             class='au-c-data-table__image'
                           />

package/addon/plugins/roadsign-regulation-plugin/actions/insert-measure.ts

@@ -23,12 +23,12 @@ import { MobilityMeasureConcept } from '../schemas/mobility-measure-concept';
 import { Variable } from '../schemas/variable';
 import { buildArticleStructure } from '../../decision-plugin/utils/build-article-structure';
 import { insertArticle } from '../../decision-plugin/actions/insert-article';
-import { SignConcept } from '../schemas/sign-concept';
+import { TrafficSignalConcept } from '../schemas/traffic-signal-concept';
 import {
   ROAD_SIGN_CATEGORIES,
-  SIGN_CONCEPT_TYPES,
-  SIGN_TYPE_MAPPING,
-  SIGN_TYPES,
+  TRAFFIC_SIGNAL_CONCEPT_TYPES,
+  TRAFFIC_SIGNAL_TYPE_MAPPING,
+  TRAFFIC_SIGNAL_TYPES,
   ZONALITY_OPTIONS,
 } from '../constants';
 import { createTextVariable } from '../../variable-plugin/actions/create-text-variable';
@@ -59,7 +59,7 @@ export default function insertMeasure({
 }: InsertMeasureArgs): TransactionMonad<boolean> {
   return function (state: EditorState) {
     const { schema } = state;
-    const signNodes = measureConcept.signConcepts.map((signConcept) =>
+    const signNodes = measureConcept.trafficSignalConcepts.map((signConcept) =>
       constructSignNode(signConcept, schema),
     );
     let signSection: PNode[] = [];
@@ -191,13 +191,13 @@ function constructMeasureBody(
   return schema.nodes.paragraph.create({}, nodes);
 }
 
-function determineSignLabel(signConcept: SignConcept) {
+function determineSignLabel(signConcept: TrafficSignalConcept) {
   switch (signConcept.type) {
-    case SIGN_CONCEPT_TYPES.TRAFFIC_LIGHT:
+    case TRAFFIC_SIGNAL_CONCEPT_TYPES.TRAFFIC_LIGHT:
       return 'Verkeerslicht';
-    case SIGN_CONCEPT_TYPES.ROAD_MARKING:
+    case TRAFFIC_SIGNAL_CONCEPT_TYPES.ROAD_MARKING:
       return 'Wegmarkering';
-    case SIGN_CONCEPT_TYPES.ROAD_SIGN:
+    case TRAFFIC_SIGNAL_CONCEPT_TYPES.ROAD_SIGN:
       if (
         signConcept.categories
           .map((cat) => cat.uri)
@@ -210,7 +210,7 @@ function determineSignLabel(signConcept: SignConcept) {
   }
 }
 
-function constructSignNode(signConcept: SignConcept, schema: Schema) {
+function constructSignNode(signConcept: TrafficSignalConcept, schema: Schema) {
   const signUri = `http://data.lblod.info/verkeerstekens/${uuid()}`;
   const prefix = determineSignLabel(signConcept);
   const node = schema.nodes.inline_rdfa.create(
@@ -221,11 +221,13 @@ function constructSignNode(signConcept: SignConcept, schema: Schema) {
       properties: [
         {
           predicate: RDF('type').full,
-          object: sayDataFactory.namedNode(SIGN_TYPES.TRAFFIC_SIGN),
+          object: sayDataFactory.namedNode(TRAFFIC_SIGNAL_TYPES.TRAFFIC_SIGNAL),
         },
         {
           predicate: RDF('type').full,
-          object: sayDataFactory.namedNode(SIGN_TYPE_MAPPING[signConcept.type]),
+          object: sayDataFactory.namedNode(
+            TRAFFIC_SIGNAL_TYPE_MAPPING[signConcept.type],
+          ),
         },
         {
           predicate: MOBILITEIT('heeftVerkeersbordconcept'),

package/addon/plugins/roadsign-regulation-plugin/constants.ts

@@ -8,25 +8,28 @@ export const ZONALITY_OPTIONS = {
     'http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc',
 } as const;
 
-export const SIGN_CONCEPT_TYPES = {
-  TRAFFIC_SIGN: MOBILITEIT('Verkeerstekenconcept').full,
+export const TRAFFIC_SIGNAL_CONCEPT_TYPES = {
+  TRAFFIC_SIGNAL: MOBILITEIT('Verkeerstekenconcept').full,
   ROAD_SIGN: MOBILITEIT('Verkeersbordconcept').full,
   TRAFFIC_LIGHT: MOBILITEIT('Verkeerslichtconcept').full,
   ROAD_MARKING: MOBILITEIT('Wegmarkeringconcept').full,
 } as const;
 
-export const SIGN_TYPES = {
-  TRAFFIC_SIGN: MOBILITEIT('Verkeersteken').full,
+export const TRAFFIC_SIGNAL_TYPES = {
+  TRAFFIC_SIGNAL: MOBILITEIT('Verkeersteken').full,
   ROAD_SIGN: MOBILITEIT('Verkeersbord').full,
   TRAFFIC_LIGHT: MOBILITEIT('Verkeerslicht').full,
   ROAD_MARKING: MOBILITEIT('Wegmarkering').full,
 } as const;
 
-export const SIGN_TYPE_MAPPING = {
-  [SIGN_CONCEPT_TYPES.TRAFFIC_SIGN]: SIGN_TYPES.TRAFFIC_SIGN,
-  [SIGN_CONCEPT_TYPES.ROAD_SIGN]: SIGN_TYPES.ROAD_SIGN,
-  [SIGN_CONCEPT_TYPES.TRAFFIC_LIGHT]: SIGN_TYPES.TRAFFIC_LIGHT,
-  [SIGN_CONCEPT_TYPES.ROAD_MARKING]: SIGN_TYPES.ROAD_MARKING,
+export const TRAFFIC_SIGNAL_TYPE_MAPPING = {
+  [TRAFFIC_SIGNAL_CONCEPT_TYPES.TRAFFIC_SIGNAL]:
+    TRAFFIC_SIGNAL_TYPES.TRAFFIC_SIGNAL,
+  [TRAFFIC_SIGNAL_CONCEPT_TYPES.ROAD_SIGN]: TRAFFIC_SIGNAL_TYPES.ROAD_SIGN,
+  [TRAFFIC_SIGNAL_CONCEPT_TYPES.TRAFFIC_LIGHT]:
+    TRAFFIC_SIGNAL_TYPES.TRAFFIC_LIGHT,
+  [TRAFFIC_SIGNAL_CONCEPT_TYPES.ROAD_MARKING]:
+    TRAFFIC_SIGNAL_TYPES.ROAD_MARKING,
 } as const;
 
 export const ROAD_SIGN_CATEGORIES = {

package/addon/plugins/roadsign-regulation-plugin/queries/mobility-measure-concept.ts

@@ -9,14 +9,14 @@ import {
   MobilityMeasureConceptSchema,
 } from '../schemas/mobility-measure-concept';
 import { z } from 'zod';
-import { querySignConcepts } from './sign-concept';
+import { queryTrafficSignalConcepts } from './traffic-signal-concept';
 import { ZONALITY_OPTIONS } from '../constants';
 
 type QueryOptions<Count extends boolean = boolean> = {
   imageBaseUrl?: string;
   searchString?: string;
   zonality?: string;
-  signType?: string;
+  trafficSignalType?: string;
   codes?: string[];
   category?: string;
   page?: number;
@@ -32,15 +32,18 @@ type Result<Count extends boolean> = Count extends true
 function _buildFilters(
   options: Omit<QueryOptions, 'page' | 'pageSize' | 'abortSignal' | 'count'>,
 ) {
-  const { zonality, signType, codes, category, searchString } = options;
+  const { zonality, trafficSignalType, codes, category, searchString } =
+    options;
   const filters = [];
   if (zonality) {
     filters.push(
       `FILTER(?zonality IN (${sparqlEscapeUri(zonality)}, ${sparqlEscapeUri(ZONALITY_OPTIONS.POTENTIALLY_ZONAL)}))`,
     );
   }
-  if (signType) {
-    filters.push(`FILTER(?signType = ${sparqlEscapeUri(signType)})`);
+  if (trafficSignalType) {
+    filters.push(
+      `FILTER(?trafficSignalType = ${sparqlEscapeUri(trafficSignalType)})`,
+    );
   }
   if (codes) {
     filters.push(`
@@ -100,7 +103,7 @@ async function _queryMobilityMeasures<Count extends boolean>(
       ?templateUri ext:preview ?preview.
 
       ?signUri
-        a ?signType;
+        a ?trafficSignalType;
         mobiliteit:heeftMaatregelconcept ?uri;
         skos:prefLabel ?signCode.
 
@@ -139,13 +142,16 @@ async function _queryMobilityMeasures<Count extends boolean>(
     );
     const conceptsWithSigns = await Promise.all(
       concepts.map(async (concept) => {
-        const signConcepts = await querySignConcepts(endpoint, {
-          measureConceptUri: concept.uri,
-          imageBaseUrl,
-        });
+        const trafficSignalConcepts = await queryTrafficSignalConcepts(
+          endpoint,
+          {
+            measureConceptUri: concept.uri,
+            imageBaseUrl,
+          },
+        );
         return {
           ...concept,
-          signConcepts,
+          trafficSignalConcepts,
         };
       }),
     );

package/addon/plugins/roadsign-regulation-plugin/queries/{sign-codes.ts → traffic-signal-codes.ts}

@@ -5,9 +5,9 @@ import {
   sparqlEscapeString,
   sparqlEscapeUri,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/sparql-helpers';
-import { SignCodeSchema } from '../schemas/sign-code';
+import { TrafficSignalCodeSchema } from '../schemas/traffic-signal-code';
 
-const DEFAULT_SIGN_TYPES = [
+const DEFAULT_SIGNAL_TYPES = [
   'https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept',
   'https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept',
   'https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept',
@@ -24,7 +24,7 @@ type QueryOptions = {
 function buildFilters({
   searchString,
   roadSignCategory,
-  types = DEFAULT_SIGN_TYPES,
+  types = DEFAULT_SIGNAL_TYPES,
   combinedWith,
 }: Omit<QueryOptions, 'abortSignal'>) {
   const categoryFilter = roadSignCategory
@@ -32,7 +32,7 @@ function buildFilters({
     : '';
   const typesArray = !Array.isArray(types) ? [types] : types;
   const typeFilter = `
-    VALUES ?signType {
+    VALUES ?trafficSignalType {
       ${typesArray.map((type) => sparqlEscapeUri(type)).join(`\n`)}
     }
   `;
@@ -70,13 +70,16 @@ function buildFilters({
   `;
 }
 
-export default async function querySignCodes(
+export default async function queryTrafficSignalCodes(
   endpoint: string,
   options: QueryOptions = {},
 ) {
   const { abortSignal } = options;
   const filterStatement = buildFilters(options);
 
+  // The sorting here is a little weird. This is to handle labels which are normally of the form
+  // 'A1.3b', where the 1.3 should be sorted as a number. There is no enforcement of this format, so
+  // we try to handle cases such as 'weird1.2.3LABEL' in a way that is not too broken.
   const query = /* sparql */ `
     PREFIX mobiliteit: <https://data.vlaanderen.be/ns/mobiliteit#>
     PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
@@ -88,14 +91,17 @@ export default async function querySignCodes(
       ?label
     WHERE {
       ?uri mobiliteit:heeftMaatregelconcept ?measure.
-      ?uri a ?signType;
+      ?uri a ?trafficSignalType;
               skos:prefLabel ?label;
               ext:valid ${sparqlEscapeBool(true)}.
       ${filterStatement}
+      BIND(REPLACE(?label, "^(\\\\D+).*", "$1", "i") AS ?firstLetters)
+      BIND(xsd:decimal(REPLACE(?label, "^\\\\D+(\\\\d*\\\\.?\\\\d*).*", "$1", "i")) AS ?number)
+      BIND(REPLACE(?label, "^\\\\D+\\\\d*\\\\.?\\\\d*(.*)", "$1", "i") AS ?secondLetters)
     }
-    ORDER BY ASC(?label)
+    ORDER BY ASC(UCASE(?firstLetters)) ASC(?number) ASC(LCASE(?secondLetters))
   `;
   const queryResult = await executeQuery({ endpoint, query, abortSignal });
   const bindings = queryResult.results.bindings;
-  return SignCodeSchema.array().parse(bindings.map(objectify));
+  return TrafficSignalCodeSchema.array().parse(bindings.map(objectify));
 }

package/addon/plugins/roadsign-regulation-plugin/queries/{sign-concept.ts → traffic-signal-concept.ts}

@@ -5,9 +5,12 @@ import {
   sparqlEscapeString,
   sparqlEscapeUri,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/sparql-helpers';
-import { SignConcept, SignConceptSchema } from '../schemas/sign-concept';
+import {
+  TrafficSignalConcept,
+  TrafficSignalConceptSchema,
+} from '../schemas/traffic-signal-concept';
 import queryRoadSignCategories from './road-sign-category';
-import { SIGN_CONCEPT_TYPES } from '../constants';
+import { TRAFFIC_SIGNAL_CONCEPT_TYPES } from '../constants';
 
 type QueryOptions = {
   imageBaseUrl?: string;
@@ -15,7 +18,7 @@ type QueryOptions = {
   abortSignal?: AbortSignal;
 };
 
-export async function querySignConcepts(
+export async function queryTrafficSignalConcepts(
   endpoint: string,
   options: QueryOptions = {},
 ) {
@@ -55,16 +58,18 @@ export async function querySignConcepts(
       ${measureConceptUri ? `?uri mobiliteit:heeftMaatregelconcept ${sparqlEscapeUri(measureConceptUri)}` : ''}
     }
   `;
-  const queryResult = await executeQuery<BindingObject<SignConcept>>({
+  const queryResult = await executeQuery<BindingObject<TrafficSignalConcept>>({
     query,
     endpoint,
     abortSignal,
   });
   const bindings = queryResult.results.bindings;
-  const concepts = SignConceptSchema.array().parse(bindings.map(objectify));
+  const concepts = TrafficSignalConceptSchema.array().parse(
+    bindings.map(objectify),
+  );
   const conceptsWithCategories = await Promise.all(
     concepts.map(async (concept) => {
-      if (concept.type === SIGN_CONCEPT_TYPES.ROAD_SIGN) {
+      if (concept.type === TRAFFIC_SIGNAL_CONCEPT_TYPES.ROAD_SIGN) {
         const categories = await queryRoadSignCategories(endpoint, {
           roadSignConceptUri: concept.uri,
         });

package/addon/plugins/roadsign-regulation-plugin/schemas/mobility-measure-concept.ts

@@ -1,5 +1,5 @@
 import { ZONALITY_OPTIONS } from '../constants';
-import { SignConceptSchema } from './sign-concept';
+import { TrafficSignalConceptSchema } from './traffic-signal-concept';
 import { z } from 'zod';
 
 export const MobilityMeasureConceptSchema = z.object({
@@ -8,7 +8,7 @@ export const MobilityMeasureConceptSchema = z.object({
   preview: z.string(),
   zonality: z.nativeEnum(ZONALITY_OPTIONS),
   variableSignage: z.boolean().default(false),
-  signConcepts: z.array(SignConceptSchema).default([]),
+  trafficSignalConcepts: z.array(TrafficSignalConceptSchema).default([]),
 });
 
 export type MobilityMeasureConcept = z.infer<

package/addon/plugins/roadsign-regulation-plugin/schemas/traffic-signal-code.ts

@@ -0,0 +1,8 @@
+import { z } from 'zod';
+
+export const TrafficSignalCodeSchema = z.object({
+  uri: z.string(),
+  label: z.string(),
+});
+
+export type TrafficSignalCode = z.infer<typeof TrafficSignalCodeSchema>;

package/addon/plugins/roadsign-regulation-plugin/schemas/{sign-concept.ts → traffic-signal-concept.ts}

@@ -1,8 +1,8 @@
 import { z } from 'zod';
-import { SIGN_CONCEPT_TYPES, ZONALITY_OPTIONS } from '../constants';
+import { TRAFFIC_SIGNAL_CONCEPT_TYPES, ZONALITY_OPTIONS } from '../constants';
 import { RoadSignCategorySchema } from './road-sign-category';
 
-export const SignConceptSchema = z
+export const TrafficSignalConceptSchema = z
   .object({
     uri: z.string(),
     code: z.string(),
@@ -12,16 +12,16 @@ export const SignConceptSchema = z
   .and(
     z.discriminatedUnion('type', [
       z.object({
-        type: z.literal(SIGN_CONCEPT_TYPES.ROAD_SIGN),
+        type: z.literal(TRAFFIC_SIGNAL_CONCEPT_TYPES.ROAD_SIGN),
         categories: z.array(RoadSignCategorySchema).default([]),
       }),
       z.object({
         type: z.enum([
-          SIGN_CONCEPT_TYPES.ROAD_MARKING,
-          SIGN_CONCEPT_TYPES.TRAFFIC_LIGHT,
+          TRAFFIC_SIGNAL_CONCEPT_TYPES.ROAD_MARKING,
+          TRAFFIC_SIGNAL_CONCEPT_TYPES.TRAFFIC_LIGHT,
         ]),
       }),
     ]),
   );
 
-export type SignConcept = z.infer<typeof SignConceptSchema>;
+export type TrafficSignalConcept = z.infer<typeof TrafficSignalConceptSchema>;

package/declarations/addon/components/roadsign-regulation-plugin/roadsigns-modal.d.ts

@@ -2,6 +2,7 @@ import Component from '@glimmer/component';
 import { SayController } from '@lblod/ember-rdfa-editor';
 import { RoadsignRegulationPluginOptions } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin';
 import { MobilityMeasureConcept } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/schemas/mobility-measure-concept';
+import { Select } from 'ember-power-select/components/power-select';
 import { TaskInstance } from 'reactiveweb/ember-concurrency';
 import { ZONALITY_OPTIONS } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
 type Option = {
@@ -43,6 +44,7 @@ export default class RoadsignsModal extends Component<Signature> {
     changeZonality(value: Zonality): void;
     handleSearch(event: InputEvent): void;
     closeModal(): void;
+    doFirstCodeSearch(select: Select): boolean;
     searchCodes: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, (term: string) => Promise<{
         label: string;
         uri: string;
@@ -63,7 +65,7 @@ export default class RoadsignsModal extends Component<Signature> {
         label: string;
         uri: string;
     }[];
-    signConceptTypes: ({
+    trafficSignalConceptTypes: ({
         label: string;
         uri: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
     } | {
@@ -84,7 +86,7 @@ export default class RoadsignsModal extends Component<Signature> {
             zonality: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc";
             preview: string;
             variableSignage: boolean;
-            signConcepts: ({
+            trafficSignalConcepts: ({
                 code: string;
                 image: string;
                 uri: string;
@@ -111,7 +113,7 @@ export default class RoadsignsModal extends Component<Signature> {
         zonality: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc";
         preview: string;
         variableSignage: boolean;
-        signConcepts: ({
+        trafficSignalConcepts: ({
             code: string;
             image: string;
             uri: string;

package/declarations/addon/plugins/roadsign-regulation-plugin/constants.d.ts

@@ -3,19 +3,19 @@ export declare const ZONALITY_OPTIONS: {
     readonly ZONAL: "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d";
     readonly NON_ZONAL: "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc";
 };
-export declare const SIGN_CONCEPT_TYPES: {
-    readonly TRAFFIC_SIGN: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerstekenconcept";
+export declare const TRAFFIC_SIGNAL_CONCEPT_TYPES: {
+    readonly TRAFFIC_SIGNAL: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerstekenconcept";
     readonly ROAD_SIGN: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
     readonly TRAFFIC_LIGHT: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept";
     readonly ROAD_MARKING: "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
 };
-export declare const SIGN_TYPES: {
-    readonly TRAFFIC_SIGN: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersteken";
+export declare const TRAFFIC_SIGNAL_TYPES: {
+    readonly TRAFFIC_SIGNAL: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersteken";
     readonly ROAD_SIGN: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbord";
     readonly TRAFFIC_LIGHT: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslicht";
     readonly ROAD_MARKING: "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkering";
 };
-export declare const SIGN_TYPE_MAPPING: {
+export declare const TRAFFIC_SIGNAL_TYPE_MAPPING: {
     readonly "https://data.vlaanderen.be/ns/mobiliteit#Verkeerstekenconcept": "https://data.vlaanderen.be/ns/mobiliteit#Verkeersteken";
     readonly "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept": "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbord";
     readonly "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept": "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslicht";

package/declarations/addon/plugins/roadsign-regulation-plugin/queries/mobility-measure-concept.d.ts

@@ -2,7 +2,7 @@ type QueryOptions<Count extends boolean = boolean> = {
     imageBaseUrl?: string;
     searchString?: string;
     zonality?: string;
-    signType?: string;
+    trafficSignalType?: string;
     codes?: string[];
     category?: string;
     page?: number;
@@ -16,7 +16,7 @@ export declare function queryMobilityMeasures(endpoint: string, options?: Omit<Q
     zonality: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc";
     preview: string;
     variableSignage: boolean;
-    signConcepts: ({
+    trafficSignalConcepts: ({
         code: string;
         image: string;
         uri: string;

package/declarations/addon/plugins/roadsign-regulation-plugin/queries/{sign-codes.d.ts → traffic-signal-codes.d.ts}

@@ -5,7 +5,7 @@ type QueryOptions = {
     combinedWith?: string | string[];
     abortSignal?: AbortSignal;
 };
-export default function querySignCodes(endpoint: string, options?: QueryOptions): Promise<{
+export default function queryTrafficSignalCodes(endpoint: string, options?: QueryOptions): Promise<{
     label: string;
     uri: string;
 }[]>;

package/declarations/addon/plugins/roadsign-regulation-plugin/queries/{sign-concept.d.ts → traffic-signal-concept.d.ts}

@@ -3,7 +3,7 @@ type QueryOptions = {
     measureConceptUri?: string;
     abortSignal?: AbortSignal;
 };
-export declare function querySignConcepts(endpoint: string, options?: QueryOptions): Promise<(({
+export declare function queryTrafficSignalConcepts(endpoint: string, options?: QueryOptions): Promise<(({
     code: string;
     image: string;
     uri: string;

package/declarations/addon/plugins/roadsign-regulation-plugin/schemas/mobility-measure-concept.d.ts

@@ -9,7 +9,7 @@ export declare const MobilityMeasureConceptSchema: z.ZodObject<{
         readonly NON_ZONAL: "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc";
     }>;
     variableSignage: z.ZodDefault<z.ZodBoolean>;
-    signConcepts: z.ZodDefault<z.ZodArray<z.ZodIntersection<z.ZodObject<{
+    trafficSignalConcepts: z.ZodDefault<z.ZodArray<z.ZodIntersection<z.ZodObject<{
         uri: z.ZodString;
         code: z.ZodString;
         image: z.ZodString;
@@ -65,7 +65,7 @@ export declare const MobilityMeasureConceptSchema: z.ZodObject<{
     zonality: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc";
     preview: string;
     variableSignage: boolean;
-    signConcepts: ({
+    trafficSignalConcepts: ({
         code: string;
         image: string;
         uri: string;
@@ -85,7 +85,7 @@ export declare const MobilityMeasureConceptSchema: z.ZodObject<{
     zonality: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc";
     preview: string;
     variableSignage?: boolean | undefined;
-    signConcepts?: ({
+    trafficSignalConcepts?: ({
         code: string;
         image: string;
         uri: string;

package/declarations/addon/plugins/roadsign-regulation-plugin/schemas/{sign-code.d.ts → traffic-signal-code.d.ts}

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-export declare const SignCodeSchema: z.ZodObject<{
+export declare const TrafficSignalCodeSchema: z.ZodObject<{
     uri: z.ZodString;
     label: z.ZodString;
 }, "strip", z.ZodTypeAny, {
@@ -9,4 +9,4 @@ export declare const SignCodeSchema: z.ZodObject<{
     label: string;
     uri: string;
 }>;
-export type SignCode = z.infer<typeof SignCodeSchema>;
+export type TrafficSignalCode = z.infer<typeof TrafficSignalCodeSchema>;

package/declarations/addon/plugins/roadsign-regulation-plugin/schemas/{sign-concept.d.ts → traffic-signal-concept.d.ts}

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-export declare const SignConceptSchema: z.ZodIntersection<z.ZodObject<{
+export declare const TrafficSignalConceptSchema: z.ZodIntersection<z.ZodObject<{
     uri: z.ZodString;
     code: z.ZodString;
     image: z.ZodString;
@@ -49,4 +49,4 @@ export declare const SignConceptSchema: z.ZodIntersection<z.ZodObject<{
 }, {
     type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
 }>]>>;
-export type SignConcept = z.infer<typeof SignConceptSchema>;
+export type TrafficSignalConcept = z.infer<typeof TrafficSignalConceptSchema>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "32.4.1",
+  "version": "32.5.0-dev.e43d6dc46e0ca0a9cbcfb4bdd58985927f840af9",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",

package/addon/plugins/roadsign-regulation-plugin/schemas/sign-code.ts

@@ -1,8 +0,0 @@
-import { z } from 'zod';
-
-export const SignCodeSchema = z.object({
-  uri: z.string(),
-  label: z.string(),
-});
-
-export type SignCode = z.infer<typeof SignCodeSchema>;