michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-05-26 06:30:29 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:koush/scrypted

Browse Source
This commit is contained in:
Koushik Dutta
2023-09-09 13:45:24 -07:00
parent 6ada4854bc bc5e89668f
commit 6e109d89e0
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/config.yaml
View File

@@ -1,6 +1,6 @@
# Home Assistant Addon Configuration
name: Scrypted
version: "18-jammy-full.s6-v0.41.0"
version: "18-jammy-full.s6-v0.50.0"
slug: scrypted
description: Scrypted is a high performance home video integration and automation platform
url: "https://github.com/koush/scrypted"

17
plugins/core/ui/src/interfaces/sensors/PositionSensor.vue
View File

@@ -10,20 +10,29 @@
doubleClickZoom: false,
boxZoom: false,
scrollWheelZoom: false,
touchZoom: false,
}"
>
<l-tile-layer :url="url" :attribution="attribution"></l-tile-layer>
<l-marker :lat-lng="position" :icon="icon"></l-marker>
<l-marker :lat-lng="position"></l-marker>
<l-control-attribution position="bottomright" :prefix="prefix"></l-control-attribution>
</l-map>
</template>
<script>
import { latLng, icon } from "leaflet";
import { latLng, Icon } from "leaflet";
import { LMap, LTileLayer, LMarker, LControlAttribution } from "vue2-leaflet";
import 'leaflet/dist/leaflet.css';
import RPCInterface from "../RPCInterface.vue";
// https://vue2-leaflet.netlify.app/quickstart/#marker-icons-are-missing
delete Icon.Default.prototype._getIconUrl;
Icon.Default.mergeOptions({
iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
iconUrl: require('leaflet/dist/images/marker-icon.png'),
shadowUrl: require('leaflet/dist/images/marker-shadow.png'),
});
export default {
mixins: [RPCInterface],
components: {
@@ -37,10 +46,6 @@ export default {
url: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
prefix: '<a target="blank" href="https://leafletjs.com/">Leaflet</a>',
attribution: '&copy; <a target="_blank" href="http://osm.org/copyright">OpenStreetMap</a> contributors',
icon: icon({
iconUrl: "https://unpkg.com/leaflet@1.9.4/dist/images/marker-icon.png",
shadowUrl: "https://unpkg.com/leaflet@1.9.4/dist/images/marker-shadow.png",
}),
};
},
computed: {