Merge branch 'develop' into feature/model-tree-file-status

infrastructure/explorer.bicep

@@ -6,7 +6,7 @@ var applicationInsightsName = '${moduleName}-ai-${environment}'
 
 var isProd = environment == 'prod'
 
-var assetStorageAccountName = isProd ? 'novorenderblobs' : 'novorenderblobs${environment}'
+var assetStorageAccountName = isProd ? 'https://assets.novorender.com' : 'https://${environment}.assets.novorender.com'
 
 var keyVaultName = 'novovault-${environment}'
 var keyVaultResourceGroup = 'common-${environment}'
@@ -27,7 +27,7 @@ var appSettings = {
     XSITEMANAGE_CLIENT_ID: '@Microsoft.KeyVault(VaultName=${keyVaultName};SecretName=xsitemanage-client-id)'
     NOVORENDER_CLIENT_ID: '@Microsoft.KeyVault(VaultName=${keyVaultName};SecretName=novorender-client-id)'
     NOVORENDER_CLIENT_SECRET: '@Microsoft.KeyVault(VaultName=${keyVaultName};SecretName=novorender-client-secret)'
-    ASSETS_URL: 'https://${assetStorageAccountName}.blob.${az.environment().suffixes.storage}/assets'
+    ASSETS_URL: assetStorageAccountName
     MIXPANEL_TOKEN: '@Microsoft.KeyVault(VaultName=${keyVaultName};SecretName=mixpanel-token)'
     APPINSIGHTS_INSTRUMENTATIONKEY: appInsights.properties.InstrumentationKey
     APPLICATIONINSIGHTS_CONNECTION_STRING: appInsights.properties.ConnectionString

package.json

@@ -1,6 +1,6 @@
 {
     "name": "novoweb",
-    "version": "1.43.2",
+    "version": "1.44.1",
     "type": "module",
     "description": "Novorender frontend",
     "main": "index.js",
@@ -52,7 +52,7 @@
         "prettier": "^3.3.3",
         "skott": "^0.35.2",
         "typescript": "^5.5.4",
-        "vite": "^5.4.5",
+        "vite": "^5.4.14",
         "vite-plugin-env-compatible": "^2.0.1",
         "vite-plugin-pwa": "^0.20.1",
         "vite-plugin-svgr": "^4.2.0"
@@ -68,8 +68,8 @@
         "@mui/lab": "^5.0.0-alpha.174",
         "@mui/material": "^5.15.10",
         "@mui/x-date-pickers": "^7.23.0",
-        "@novorender/api": "0.5.19",
-        "@novorender/data-js-api": "0.2.29",
+        "@novorender/api": "1.0.3",
+        "@novorender/data-js-api": "2.0.0-beta.2",
         "@novorender/webgl-api": "0.4.59",
         "@reduxjs/toolkit": "^2.0.1",
         "@use-gesture/react": "^10.2.14",

public/locales/de/translation.json

@@ -44,17 +44,9 @@
     "deviation": "Abweichung:",
     "back": "Zurück",
     "2d": "2D",
-    "startOver": "Neu beginnen",
-    "profileStartName": "Profilstart:",
-    "profileEnd": "Profilende:",
-    "heightName": "Höhe:",
-    "profileName": "Profil:",
-    "stepSize": "Schrittgröße (Meter):",
-    "selectedCenterline": "Ausgewählte Mittellinie:",
-    "automaticallyRecenter": "Automatisch zentrieren",
+    "stepSize": "Schrittgröße",
     "verticalClipping": "Vertikale Beschneidung",
     "showGrid": "Raster anzeigen",
-    "matchStepSizeToClippingDistance": "Schrittgröße an Beschneidungsabstand anpassen",
     "clippingName": "Beschneidung:",
     "deviations": "Abweichungen",
     "showDeviationLine": "Abweichungslinie anzeigen",
@@ -1021,5 +1013,8 @@
     "converting": "Konvertieren",
     "conversionFailed": "Konvertierung fehlgeschlagen",
     "pending": "Ausstehend",
-    "deleting": "Löschen"
+    "deleting": "Löschen",
+    "tessellatedAlignmentOptionsDisclaimer": "Die hochgeladene Mittellinie ist tesselliert, daher sind alle Kurven und Klothoiden in kurze gerade Linien unterteilt. Krümmungsdaten sind nicht verfügbar.",
+    "oldAlignmentOptionsDisclaimer": "Das Modell hat ein altes Format, daher sind Krümmungsdaten nicht verfügbar. Bitte erstellen Sie das Modell neu.",
+    "completed": "Ausgefüllt"
 }

public/locales/en/translation.json

@@ -44,17 +44,9 @@
     "deviation": "Deviation:",
     "back": "Back",
     "2d": "2D",
-    "startOver": "Start over",
-    "profileStartName": "Profile start:",
-    "profileEnd": "Profile end:",
-    "heightName": "Height:",
-    "profileName": "Profile:",
-    "stepSize": "Step size (meters):",
-    "selectedCenterline": "Selected centerline:",
-    "automaticallyRecenter": "Automatically recenter",
+    "stepSize": "Step size",
     "verticalClipping": "Vertical clipping",
     "showGrid": "Show grid",
-    "matchStepSizeToClippingDistance": "Match step size to clipping distance",
     "clippingName": "Clipping:",
     "deviations": "Deviations",
     "showDeviationLine": "Show deviation line",
@@ -1021,5 +1013,8 @@
     "converting": "Converting",
     "conversionFailed": "Conversion failed",
     "pending": "Pending",
-    "deleting": "Deleting"
+    "deleting": "Deleting",
+    "tessellatedAlignmentOptionsDisclaimer": "The uploaded centerline is tessellated, so all curves and clothoids are broken into short straight lines. Curvature data is not available.",
+    "oldAlignmentOptionsDisclaimer": "The model has an old format, so curvature data is not available. Please rebuild the model.",
+    "completed": "Completed"
 }