Merge pull request #237 from CovidTrackerFr/reverting-jaw-results-map

Reverting jawg results map
CovidTrackerFr · May 27, 2021 · d28901a · d28901a
2 parents c396a48 + f4cce63
commit d28901a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 192 deletions.
diff --git a/src/components/vmd-appointment-map.component.ts b/src/components/vmd-appointment-map.component.ts
diff --git a/src/index.ts b/src/index.ts
@@ -3,7 +3,6 @@ import 'tippy.js/dist/tippy.css';
 import './vmd-app.component'
 import './components/vmd-search.component'
 import './components/vmd-appointment-card.component'
-import './components/vmd-appointment-map.component'
 import './components/vmd-appointment-metadata.component'
 import './components/vmd-commune-or-departement-selector.component'
 import './components/vmd-button-switch.component'
diff --git a/src/views/vmd-lieux.view.ts b/src/views/vmd-lieux.view.ts
@@ -82,9 +82,9 @@ export class VmdLieuxView extends LitElement {
                 console.log("error1")
             });
 
-        tileLayer('https://{s}.tile.jawg.io/jawg-sunny/{z}/{x}/{y}.png?access-token=sOXVrxPultoFMoo0oQigvvfXgPxaX0OFlFJF7y1rw0ZQy1c1yFTSnXSVOBqw0W6Y', {
+        tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
             maxZoom: 19,
-            attribution: '<a href="http://jawg.io" title="Tiles Courtesy of Jawg Maps" target="_blank" class="jawg-attrib">&copy; <b>Jawg</b>Maps</a> | <a href="https://www.openstreetmap.org/copyright" title="OpenStreetMap is open data licensed under ODbL" target="_blank" class="osm-attrib">&copy; OSM contributors</a>            '
+            attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
         }).addTo(mymap);
     }
 

diff --git a/src/views/vmd-rdv.view.ts b/src/views/vmd-rdv.view.ts
@@ -65,7 +65,6 @@ export abstract class AbstractVmdRdvView extends LitElement {
     @property({type: Array, attribute: false}) cartesAffichees: LieuAffichableAvecDistance[] = [];
 
     @internalProperty() protected currentSearch: SearchRequest | void = undefined
-    @property() private showMap: boolean = false
 
     @query("#chronodose-label") $chronodoseLabel!: HTMLSpanElement;
     protected derniereCommuneSelectionnee: Commune|undefined = undefined;
@@ -171,6 +170,7 @@ export abstract class AbstractVmdRdvView extends LitElement {
                   </h3>
 
                 <div class="spacer mt-5 mb-5"></div>
+                <div class="resultats px-2 py-5 text-dark bg-light rounded-3">
                     ${lieuxDisponibles.length ? html`
                         <h2 class="row align-items-center justify-content-center mb-5 h5 px-3">
                             <i class="bi vmdicon-calendar2-check-fill text-success me-2 fs-3 col-auto"></i>
@@ -200,35 +200,21 @@ export abstract class AbstractVmdRdvView extends LitElement {
                           </p>
                         </div>
                     `}
-
-                <div class="criteria-container text-dark rounded-3 pb-3 bg-light">
-                    <ul class="p-0 d-flex flex-row mb-5 bg-white fs-5">
-                        <li class="col bg-light text-std tab ${classMap({selected: !this.showMap})}" @click="${() => {this.showMap = false}}">
-                            Liste des lieux
-                        </li>
-                        <li class="col bg-light text-std tab ${classMap({selected: this.showMap})}" @click="${() => {this.showMap = true}}">
-                            Carte des lieux
-                        </li>
-                    </ul>
-                    <div style="display: ${this.showMap ? 'none' : 'block'};">
                         <div id="scroller">
                             ${repeat(this.cartesAffichees || [],
-                                    (c => `${c.departement}||${c.nom}||${c.plateforme}}`),
-                                    (lieu, index) => {
-                                        return html`<vmd-appointment-card
-                                style="--list-index: ${index}"
-                                .lieu="${lieu}"
-                                theme="${(!!this.currentSearch)?this.currentSearch.type:''}"
-                                .highlightable="${SearchRequest.isChronodoseType(this.currentSearch)}"
-                                @prise-rdv-cliquee="${(event: LieuCliqueCustomEvent) => this.prendreRdv(event.detail.lieu)}"
-                                @verification-rdv-cliquee="${(event: LieuCliqueCustomEvent) =>  this.verifierRdv(event.detail.lieu)}"
-                            />`;
+                                       (c => `${c.departement}||${c.nom}||${c.plateforme}}`), 
+                                       (lieu, index) => {
+                                          return html`<vmd-appointment-card
+                                    style="--list-index: ${index}"
+                                    .lieu="${lieu}"
+                                    theme="${(!!this.currentSearch)?this.currentSearch.type:''}"
+                                    .highlightable="${SearchRequest.isChronodoseType(this.currentSearch)}"
+                                    @prise-rdv-cliquee="${(event: LieuCliqueCustomEvent) => this.prendreRdv(event.detail.lieu)}"
+                                    @verification-rdv-cliquee="${(event: LieuCliqueCustomEvent) =>  this.verifierRdv(event.detail.lieu)}"
+                                />`;
                             })}
                             <div id="sentinel"></div>
                         </div>
-                    </div>
-                    ${this.showMap ? html`<vmd-appointment-map .currentSearch="${this.currentSearch}" .lieux="${this.lieuxParDepartementAffiches?this.lieuxParDepartementAffiches.lieuxAffichables:[]}"/>` : html``}
-                </div>
                 ${SearchRequest.isStandardType(this.currentSearch)?html`
                 <div class="eligibility-criteria fade-in-then-fade-out">
                     <p>Les critères d'éligibilité sont vérifiés lors de la prise de rendez-vous</p>