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/building_list/building_list.vue b/src/components/building_list/building_list.vue
index c0798a44..8e53d1d9 100644
--- a/src/components/building_list/building_list.vue
+++ b/src/components/building_list/building_list.vue
@@ -95,6 +95,9 @@ export default {
r['All'] = [building]
}
if ( r[building.group] ) {
+ // console.log(r)
+ // console.log(building.group)
+ console.log( r[building.group] )
r[building.group].push( building )
r[building.group].sort( ( a, b ) => ( a.name > b.name ? 1 : -1 ) )
} else {
@@ -108,6 +111,31 @@ export default {
for ( let key of keys ) {
if ( key !== 'All' ) r2[key] = r[key]
}
+ console.log( r2 )
+ console.log( Object.keys( r2 ) )
+ if ( this.buildingList ) {
+ for ( let i = 0; i < Object.keys( r2 ).length; i++ ) {
+ if ( Object.keys( r2 )[i].split( ', ' ).length > 1 ) {
+ console.log( 'gotcha' )
+ console.log( Object.keys( r2 )[i] )
+ console.log( Object.keys( r2 )[i].split( ', ' ) )
+ for ( let j = 0; j < Object.keys( r2 )[i].split( ', ' ).length; j++ ) {
+ console.log( Object.keys( r2 )[i].split( ', ' )[j] )
+ console.log( r2[Object.keys( r2 )[i].split( ', ' )[j]] )
+ console.log( Object.values( r2 )[i] )
+ // console.log(r2.Object.keys(r2)[i])
+ // console.log(r2['Events & Admin, Solar'])
+ r2[Object.keys( r2 )[i].split( ', ' )[j]].push( Object.values( r2 )[i][0] )
+ console.log( r2[Object.keys( r2 )[i]] )
+ console.log( r2[Object.keys( r2 )[i].split( ', ' )[j]] )
+ // delete r2[Object.keys(r2)[i]]
+ // r2[Object.keys(r2)[i].split(', ')[j]].push(Object.values(r2)[i])
+ }
+ delete r2[Object.keys( r2 )[i]]
+ console.log( Object.values( r2 )[i][0] )
+ }
+ }
+ }
return r2
} else {
return this.$store.getters['user/views']
diff --git a/src/components/map/map.vue b/src/components/map/map.vue
index 1b458990..836d0523 100644
--- a/src/components/map/map.vue
+++ b/src/components/map/map.vue
@@ -186,6 +186,7 @@ export default {
this.polyClick( e.target.feature.properties.id, e.target.feature, layer.getBounds().getCenter() )
} )
layer.on( 'mouseover', function ( e ) {
+ console.log( e.target )
if ( !e.target.setStyle ) return
if ( e.target.feature.id === 'way/1100972272' ) {
e.target.feature.properties.name = 'OSU Operations'
@@ -239,6 +240,7 @@ export default {
},
methods: {
polyClick: function ( id, feature, center ) {
+ console.log( center )
if ( !this.askingForComparison ) {
window.vue.$store.dispatch( 'modalController/openModal', {
name: 'map_side_view',
@@ -278,6 +280,31 @@ export default {
for ( let layer of Object.values( this.map._layers ) ) {
layer.unbindTooltip()
}
+ L.polygon(
+ [
+ [44.56639145, -123.27533365],
+ [44.57639145, -123.27533365],
+ [44.57639145, -123.26533365],
+ [44.56639145, -123.26533365]
+ ],
+ { fillColor: 'url(#stripes)', fillOpacity: 1 }
+ ).addTo( this.map )
+
+ let fillPalette = ['orange', 'green', 'blue']
+
+ let gradientString = `
+
+
+
+
+
+
+`
+
+ let svg = document.getElementsByTagName( 'svg' )[0]
+ let svgDefs = document.createElementNS( 'http://www.w3.org/2000/svg', 'defs' )
+ svgDefs.insertAdjacentHTML( 'afterbegin', gradientString )
+ svg.appendChild( svgDefs )
},
getResult ( searchResult ) {
for ( let layer of Object.values( this.map._layers ) ) {
@@ -374,6 +401,8 @@ export default {
}
},
handleSelect: function ( string ) {
+ console.log( this.$store.getters['map/buildings'] )
+ console.log( this.selected )
if ( this.selected.indexOf( string ) >= 0 ) {
this.selected.splice( this.selected.indexOf( string ), 1 )
} else {
@@ -555,9 +584,62 @@ export default {
this.map = this.$refs.map.mapObject
for ( var layerKey of Object.keys( this.map._layers ) ) {
let layer = this.map._layers[layerKey]
+ if ( layer.feature && layer.feature.geometry && layer.feature.geometry.type === 'Polygon' ) {
+ if ( layer.feature.properties.name === 'OSU 35th Street Solar Field' ) {
+ console.log( layer.feature.properties.name )
+ console.log( layer.feature.geometry.coordinates )
+ console.log( layer.feature.geometry.coordinates[0].length )
+ let transform2darr = []
+ for ( var i = 0; i < layer.feature.geometry.coordinates[0].length; i++ ) {
+ let latvar = layer.feature.geometry.coordinates[0][i][1]
+ let longvar = layer.feature.geometry.coordinates[0][i][0]
+ let tarr = []
+ tarr.push( latvar )
+ tarr.push( longvar )
+ transform2darr.push( tarr )
+ }
+ console.log( transform2darr )
+
+ L.polygon( transform2darr, { fillColor: 'url(#stripes)', fillOpacity: 1 } ).addTo( this.map )
+
+ let fillPalette = ['orange', 'green', 'blue']
+
+ let gradientString = `
+
+
+
+
+
+
+ `
+
+ let svg = document.getElementsByTagName( 'svg' )[0]
+ let svgDefs = document.createElementNS( 'http://www.w3.org/2000/svg', 'defs' )
+ svgDefs.insertAdjacentHTML( 'afterbegin', gradientString )
+ svg.appendChild( svgDefs )
+ }
+ }
if ( layer.feature ) {
- if ( !val.includes( layer.feature.properties.group ) && this.grouping === 'Category' ) {
- this.map.removeLayer( layer )
+ console.log( layer.feature.properties.group )
+ console.log( layer.feature.properties.group.split( ', ' ) )
+ if ( layer.feature.properties.group.split( ', ' ).length > 1 ) {
+ let categoryCoverage = 0
+ for ( let i = 0; i < layer.feature.properties.group.split( ', ' ).length; i++ ) {
+ console.log( layer.feature.properties.group.split( ', ' )[i] )
+ if ( !val.includes( layer.feature.properties.group.split( ', ' )[i] ) && this.grouping === 'Category' ) {
+ console.log( layer.feature.properties.group.split( ', ' )[i] )
+ categoryCoverage++
+ }
+ }
+ console.log( categoryCoverage )
+ if ( categoryCoverage >= layer.feature.properties.group.split( ', ' ).length ) {
+ this.map.removeLayer( layer )
+ }
+ console.log( 'here' )
+ } else {
+ if ( !val.includes( layer.feature.properties.group ) && this.grouping === 'Category' ) {
+ this.map.removeLayer( layer )
+ }
}
}
}