Fix report ID, get to where organization ID is passed through correctly
This commit is contained in:
parent
f33020e2b8
commit
a64df8a687
5 changed files with 18 additions and 11 deletions
|
|
@ -38,7 +38,7 @@
|
|||
id="map"
|
||||
:bounds="mapBounds"
|
||||
:markers="mapMarkers"
|
||||
:organization-id="user.organization.id"
|
||||
:organizationId="user.organization.id"
|
||||
:tegola="user.urls.tegola"
|
||||
:xmin="user.organization.service_area?.min.x ?? 0"
|
||||
:ymin="user.organization.service_area?.min.y ?? 0"
|
||||
|
|
|
|||
|
|
@ -1,8 +1,17 @@
|
|||
<template>
|
||||
<p>A flyover pool</p>
|
||||
<MapProxiedArcgisTile/>
|
||||
<p>A flyover pool</p>
|
||||
<MapProxiedArcgisTile
|
||||
id="tile-map"
|
||||
:latitude="pool.location.latitude"
|
||||
:longitude="pool.location.longitude"
|
||||
:markers="tileMapMarkers"
|
||||
:organizationId="user.organization.id"
|
||||
:tegola="user.urls.tegola" />
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { useUserStore } from "../store/user";
|
||||
import MapProxiedArcgisTile from "@/components/MapProxiedArcgisTile.vue";
|
||||
|
||||
const user = useUserStore();
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -30,13 +30,11 @@ import {
|
|||
import { Bounds, Marker } from "@/types";
|
||||
import maplibregl from "maplibre-gl";
|
||||
|
||||
interface Emits {
|
||||
(e: "load"): void;
|
||||
}
|
||||
interface Emits {}
|
||||
interface Props {
|
||||
bounds?: Bounds;
|
||||
markers: Marker[];
|
||||
"organization-id": int;
|
||||
organizationId: int;
|
||||
tegola: string;
|
||||
}
|
||||
const emit = defineEmits<Emits>();
|
||||
|
|
|
|||
|
|
@ -22,14 +22,14 @@
|
|||
<script setup lang="ts">
|
||||
import "maplibre-gl/dist/maplibre-gl.css";
|
||||
import { ref, watch, onMounted, onBeforeUnmount } from "vue";
|
||||
import { Point } from "@/types";
|
||||
import maplibregl from "maplibre-gl";
|
||||
|
||||
interface Emits {
|
||||
(e: "map-click", latitude: Number, longitude: Number): void
|
||||
}
|
||||
interface Props {
|
||||
latitude: Number;
|
||||
longitude: Number;
|
||||
location: Point;
|
||||
organizationId: Number;
|
||||
tegola: string;
|
||||
urlTiles: string;
|
||||
|
|
@ -63,7 +63,7 @@ const initializeMap = () => {
|
|||
map.value = new maplibregl.Map({
|
||||
center: [props.longitude, props.latitude],
|
||||
container: mapContainer.value,
|
||||
//style: "https://tiles.stadiamaps.com/styles/osm_bright.json",
|
||||
style: "https://tiles.stadiamaps.com/styles/osm_bright.json",
|
||||
zoom: 19,
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
</span>
|
||||
</h5>
|
||||
<small class="text-muted"
|
||||
>Report ID: #{{ report.id }}</small
|
||||
>Report ID: #{{ report.public_id }}</small
|
||||
>
|
||||
</div>
|
||||
<span class="badge bg-secondary">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue