diff --git a/.env.development b/.env.development index 5fee36aa..b02de683 100644 --- a/.env.development +++ b/.env.development @@ -1,2 +1,2 @@ -VUE_APP_ROOT_API=http://localhost:3000 +VUE_APP_ROOT_API=https://api.sustainability.oregonstate.edu/v2/energy VUE_APP_HOST_ADDRESS=http://localhost:8080 \ No newline at end of file diff --git a/src/components/map/map.vue b/src/components/map/map.vue index a2a29e6a..7b941e54 100644 --- a/src/components/map/map.vue +++ b/src/components/map/map.vue @@ -205,7 +205,7 @@ export default { this.polyClick( e.target.feature.properties.id, e.target.feature, layer.getBounds().getCenter() ) } ) layer.on( 'mouseover', e => { - if ( !e.target.setStyle ) return + if ( !e.target.setStyle ) return e.target.oldStyle = { fillColor: e.target.options.fillColor, color: e.target.options.color @@ -634,9 +634,7 @@ export default { var searchGroup = [] for ( let layer of Object.values( this.map._layers ) ) { if ( layer.feature && layer.feature.geometry && layer.feature.geometry.type === 'Polygon' ) { - if ( layer.feature.id === 'way/1100972272' ) { - layer.feature.properties.name = 'OSU Operations' - } + layer.feature.properties.name = this.$store.getters['map/building']( layer.feature.properties.id ).name if ( layer.feature.properties.name !== undefined ) { if ( layer.feature.properties.name.toLowerCase().includes( v.toLowerCase() ) ) {