diff --git a/src/app/add-content/add-content.component.html b/src/app/add-content/add-content.component.html index ae0810b..6d2b30a 100644 --- a/src/app/add-content/add-content.component.html +++ b/src/app/add-content/add-content.component.html @@ -1,13 +1,17 @@
Gracias por participar
+ {{diagnostic}}Publica nuevos contenidos
Escucha en directo lo que suena en Sartaguda
" + let streamMessage = "Escucha en directo lo que suena en Sartaguda
" this.appService.add(streamMessage) } diff --git a/src/app/map-box/map-box.component.ts b/src/app/map-box/map-box.component.ts index 8f09f6b..68af423 100644 --- a/src/app/map-box/map-box.component.ts +++ b/src/app/map-box/map-box.component.ts @@ -41,6 +41,10 @@ export class MapBoxComponent implements OnInit { this.buildMap() } + public cleanMarker() { + if (this.activeMarker!=undefined) this.activeMarker.remove() + } + buildMap() { this.map = new mapboxgl.Map({ container: 'map', @@ -82,24 +86,24 @@ export class MapBoxComponent implements OnInit { }); }) }) - - this.map.on('click',(event)=> { - if (this.newMarker!=undefined) this.newMarker.remove() - - var features = this.map.queryRenderedFeatures(event.point, {layers:['clusters','soinumapa']}); - //console.log(features); - if (features.length==0) { - var el = document.createElement('div'); - el.className = 'marker new-marker'; - const coordinates = [event.lngLat.lng, event.lngLat.lat] - // const newMarker = new GeoJson(coordinates, { message : 'new marker' }) - this.appService.addMarker('new marker',coordinates) - this.newMarker = new mapboxgl.Marker(el) - .setLngLat(coordinates) - .addTo(this.map); - } - //console.log(event) - }) + // + // this.map.on('contextmenu',(event)=> { + // if (this.newMarker!=undefined) this.newMarker.remove() + // + // var features = this.map.queryRenderedFeatures(event.point, {layers:['clusters','soinumapa']}); + // //console.log(features); + // if (features.length==0) { + // var el = document.createElement('div'); + // el.className = 'marker new-marker'; + // const coordinates = [event.lngLat.lng, event.lngLat.lat] + // // const newMarker = new GeoJson(coordinates, { message : 'new marker' }) + // this.appService.addMarker('new marker',coordinates) + // this.newMarker = new mapboxgl.Marker(el) + // .setLngLat(coordinates) + // .addTo(this.map); + // } + // //console.log(event) + // }) this.map.on('click','soinumapa', (event) => { // clean old markers diff --git a/src/app/map.ts b/src/app/map.ts index 174177d..940f4e1 100644 --- a/src/app/map.ts +++ b/src/app/map.ts @@ -79,11 +79,15 @@ export class Documento { public author: string, public email: string, public category: string, - public file: string, + public file: File, public description?: string ) {} public setCoord(coord:number[]) { this.coord = new GeoJson(coord) } + + public setFile(file:File) { + this.file = file; + } } diff --git a/src/app/messages/.messages.component.ts.swp b/src/app/messages/.messages.component.ts.swp deleted file mode 100644 index 130e09a..0000000 Binary files a/src/app/messages/.messages.component.ts.swp and /dev/null differ diff --git a/src/app/messages/messages.component.css b/src/app/messages/messages.component.css index 3873f06..0a971ec 100644 --- a/src/app/messages/messages.component.css +++ b/src/app/messages/messages.component.css @@ -9,7 +9,7 @@ div.messages-container { border:#fff solid 0px; margin:20px; color:#fff; - padding:30px 10px; + padding:10px 10px; font-size:0.8em; } @@ -30,7 +30,8 @@ div.messages-container::before { h1 { font-size:1em; } -button { font-family:'Raleway',sans-serif; background:transparent; padding:5px; width:100%; color:#fff; border:#fff solid 2px;} +button.clear { font-family:'Raleway',sans-serif; background:transparent; padding:5px; width:100%; color:#fff; border:#fff solid 2px;} button:hover {background:#fff;color:#000;cursor:pointer;} audio { max-width:90%; margin:auto;} .simple-audioplayer { width:100% !important;max-width:90%;} +button.close { color:#fff; width:100%;padding:5px; margin-bottom:10px; border:0; background:transparent; text-align:right;} diff --git a/src/app/messages/messages.component.html b/src/app/messages/messages.component.html index be66584..2c2e6ea 100644 --- a/src/app/messages/messages.component.html +++ b/src/app/messages/messages.component.html @@ -1,5 +1,6 @@