Buildings and levels for the floor map, and make every identifier searchable
The map was one picture of one floor. A second floor was added, the blueprint changed size, and machines moved, so a position now records WHICH DRAWING its coordinates belong to. Buildings and levels (ADR-017). Each level owns its blueprint per theme and its own native pixel size; assets.mapx/mapy are pixels of assets.levelid, not of the site. A position whose level is unknown renders "level unknown" and is never drawn on the default level, because a marker on the wrong floor plan looks entirely correct while pointing at the wrong place. Repositioning in bulk: filter by unplaced, needs-review or level, search, place, confirm. Landmark recalibration solves the transform PER AXIS from landmark pairs and never from image dimensions - the canvas grew taller without rescaling, so a dimension-derived scale would stretch Y by 1.57 and be wrong everywhere. It defaults to a dry run, reports what would land off the drawing, snapshots before applying, and clears mapverifiedat because a transform is a guess awaiting review. Snapshots restore, including the level and the review state, and a restore snapshots first so an undo is undoable. Search: gaugelabreference was matched only for measuring tools and maintenancereference was matched nowhere at all, for any asset type, while Settings happily offers both identifiers on machines and PCs. A tag an operator is told to record has to be findable or it is a write-only field. USB devices and printed items were unreachable from search entirely - neither is an asset, so the generic asset search could not see them and no searcher existed; they now match on serial, asset tag, label, bin code and gage-lab tag, honouring isactive, with Settings toggles and result labels to match. The retired-application rule was half a rule: GET /api/knowledgebase hid articles whose topic application is retired while global search still returned them and printed the retired application as the subject. A filter is only real if every path that reaches the row applies it. Contract to 0.20.0 (additive): Asset gained levelid and mapverifiedat, Location gained levelid, and resolve_asset_position returns the levelid belonging to whichever source supplied the coordinates. The five plugins that write a map position are re-pinned. The install-list text format gained levelid as a NINTH field, appended, because the shipped Pascal installer reads fields 0-7 by index. That installer still compiles in one drawing's dimensions and bundles one blueprint, so its map is accurate for the default level only; /api/maplevels is deliberately unauthenticated so it can read both at runtime once rebuilt. Recorded in PRINTER-INSTALLER.md section 6 along with the other known gaps. Migration 7d33 converts an existing single-map site into one building and one default level carrying the old map_* settings, then assigns every placed asset and location to it. Nothing moves on screen. Old settings rows are kept so a rollback still finds them. Verified end to end on MySQL 5.6 from a production-shaped database.
This commit is contained in:
@@ -250,9 +250,11 @@
|
||||
<div class="map-location-control">
|
||||
<div v-if="form.mapx !== null && form.mapy !== null" class="current-position">
|
||||
Position: {{ form.mapx }}, {{ form.mapy }}
|
||||
<span v-if="form.levelid" class="position-level">on {{ levelName(form.levelid) }}</span>
|
||||
<span v-else class="position-level position-level-missing">level not set</span>
|
||||
<button type="button" class="btn btn-sm btn-secondary" @click="clearMapPosition">Clear</button>
|
||||
</div>
|
||||
<button type="button" class="btn btn-secondary" @click="showMapPicker = true">
|
||||
<button type="button" class="btn btn-secondary" @click="openMapPicker">
|
||||
Set Location on Map
|
||||
</button>
|
||||
</div>
|
||||
@@ -261,8 +263,19 @@
|
||||
<!-- Map Picker Modal -->
|
||||
<Modal v-model="showMapPicker" title="Select Location on Map" size="fullscreen">
|
||||
<div class="map-modal-content">
|
||||
<div v-if="levelOptions().length > 1" class="map-level-picker">
|
||||
<label>Level</label>
|
||||
<select v-model.number="pickerLevelId" class="form-control">
|
||||
<option v-for="option in levelOptions()" :key="option.levelid"
|
||||
:value="option.levelid">{{ option.label }}</option>
|
||||
</select>
|
||||
<span class="input-hint">
|
||||
The position is pixels on this drawing, so pick the level first.
|
||||
</span>
|
||||
</div>
|
||||
<ShopFloorMap
|
||||
:pickerMode="true"
|
||||
:levelid="pickerLevelId"
|
||||
:initialPosition="form.mapx !== null ? { left: form.mapx, top: form.mapy } : null"
|
||||
:theme="currentTheme"
|
||||
@positionPicked="handlePositionPicked"
|
||||
@@ -295,6 +308,8 @@ import { ref, onMounted, computed, watch } from 'vue'
|
||||
import { useRoute, useRouter } from 'vue-router'
|
||||
import { assetsApi, vendorsApi, locationsApi, printersApi, modelsApi } from '@/api'
|
||||
import ShopFloorMap from '@/components/ShopFloorMap.vue'
|
||||
import { loadMapConfig, levelOptions, levelName, state as mapConfig }
|
||||
from '@/composables/mapConfig'
|
||||
import Modal from '@/components/Modal.vue'
|
||||
import CustomFieldsInputs from '@/components/CustomFieldsInputs.vue'
|
||||
import { currentTheme } from '@/stores/theme'
|
||||
@@ -320,6 +335,10 @@ const loading = ref(true)
|
||||
const saving = ref(false)
|
||||
const error = ref('')
|
||||
const showMapPicker = ref(false)
|
||||
// Which drawing the picker shows, and therefore which level the coordinates it
|
||||
// returns belong to (ADR-017). Opens on the position's existing level so editing
|
||||
// a marker does not silently move it to the default one.
|
||||
const pickerLevelId = ref(null)
|
||||
const tempMapPosition = ref(null)
|
||||
|
||||
const form = ref({
|
||||
@@ -337,6 +356,7 @@ const form = ref({
|
||||
notes: '',
|
||||
mapx: null,
|
||||
mapy: null,
|
||||
levelid: null,
|
||||
// Printer-specific
|
||||
ipaddress: '',
|
||||
csfname: '',
|
||||
@@ -511,6 +531,7 @@ onMounted(async () => {
|
||||
notes: printer.notes || '',
|
||||
mapx: printer.mapx ?? null,
|
||||
mapy: printer.mapy ?? null,
|
||||
levelid: printer.levelid ?? null,
|
||||
// Printer-specific
|
||||
ipaddress: primaryComm?.ipaddress || '',
|
||||
csfname: ext.sharename || '',
|
||||
@@ -534,10 +555,21 @@ function handlePositionPicked(position) {
|
||||
tempMapPosition.value = position
|
||||
}
|
||||
|
||||
function openMapPicker() {
|
||||
loadMapConfig().then(() => {
|
||||
pickerLevelId.value = form.value.levelid || mapConfig.defaultlevelid
|
||||
showMapPicker.value = true
|
||||
})
|
||||
}
|
||||
|
||||
function confirmMapPosition() {
|
||||
if (tempMapPosition.value) {
|
||||
form.value.mapx = tempMapPosition.value.left
|
||||
form.value.mapy = tempMapPosition.value.top
|
||||
// Never one without the other: coordinates saved with no level render as
|
||||
// "level unknown", and coordinates saved against the wrong level render
|
||||
// convincingly in the wrong place.
|
||||
form.value.levelid = pickerLevelId.value
|
||||
}
|
||||
showMapPicker.value = false
|
||||
}
|
||||
@@ -545,6 +577,7 @@ function confirmMapPosition() {
|
||||
function clearMapPosition() {
|
||||
form.value.mapx = null
|
||||
form.value.mapy = null
|
||||
form.value.levelid = null
|
||||
tempMapPosition.value = null
|
||||
}
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
import { ref, computed, onMounted, onUnmounted, watch } from 'vue'
|
||||
import L from 'leaflet'
|
||||
import 'leaflet/dist/leaflet.css'
|
||||
import { loadMapConfig, blueprintUrlFor, state as mapConfig } from '@/composables/mapConfig'
|
||||
import { loadMapConfig, blueprintUrlFor, dimensionsFor, state as mapConfig } from '@/composables/mapConfig'
|
||||
import { printersApi } from '@/api'
|
||||
import { withBase } from '@/utils/basePath'
|
||||
import { currentTheme } from '@/stores/theme'
|
||||
@@ -55,8 +55,10 @@ const selected = ref({}) // printerid -> true
|
||||
let map = null
|
||||
let imageOverlay = null
|
||||
let markers = {} // printerid -> circleMarker
|
||||
let MAP_WIDTH = mapConfig.width
|
||||
let MAP_HEIGHT = mapConfig.height
|
||||
// The level being shown. The installer map runs before anyone logs in, which is
|
||||
// why /api/maplevels is public - without it there is no blueprint to draw.
|
||||
let MAP_WIDTH = 0
|
||||
let MAP_HEIGHT = 0
|
||||
|
||||
const SELECTED_COLOR = '#e53935'
|
||||
const NORMAL_COLOR = '#4CAF50'
|
||||
@@ -120,13 +122,13 @@ function renderMarkers() {
|
||||
}
|
||||
|
||||
watch(currentTheme, (theme) => {
|
||||
if (imageOverlay) imageOverlay.setUrl(blueprintUrlFor(theme))
|
||||
if (imageOverlay) imageOverlay.setUrl(blueprintUrlFor(theme, mapConfig.currentlevelid))
|
||||
})
|
||||
|
||||
onMounted(async () => {
|
||||
await loadMapConfig()
|
||||
MAP_WIDTH = mapConfig.width
|
||||
MAP_HEIGHT = mapConfig.height
|
||||
MAP_WIDTH = dimensionsFor(mapConfig.currentlevelid).width
|
||||
MAP_HEIGHT = dimensionsFor(mapConfig.currentlevelid).height
|
||||
|
||||
try {
|
||||
const response = await printersApi.installList()
|
||||
@@ -142,7 +144,7 @@ onMounted(async () => {
|
||||
attributionControl: false,
|
||||
})
|
||||
const bounds = [[0, 0], [MAP_HEIGHT, MAP_WIDTH]]
|
||||
imageOverlay = L.imageOverlay(blueprintUrlFor(currentTheme.value), bounds).addTo(map)
|
||||
imageOverlay = L.imageOverlay(blueprintUrlFor(currentTheme.value, mapConfig.currentlevelid), bounds).addTo(map)
|
||||
map.setView([MAP_HEIGHT / 2, MAP_WIDTH / 2], -2)
|
||||
map.setMaxBounds(bounds)
|
||||
renderMarkers()
|
||||
|
||||
Reference in New Issue
Block a user