Ignore:
Timestamp:
02/11/21 03:50:10 (4 years ago)
Author:
Dimitar Slezenkovski <dslezenkovski@…>
Branches:
master
Children:
f554983
Parents:
8eb1e21 (diff), dae4cde (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of ​https://develop.finki.ukim.mk/git/farmatiko

Location:
Farmatiko/ClientApp/src/app/dialogs
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • Farmatiko/ClientApp/src/app/dialogs/facility-dialog/facility-dialog.component.ts

    r8eb1e21 r6e6f04b  
    3232
    3333  addMarkers() {
    34     this.http.get<any>('https://nominatim.openstreetmap.org/search/?country=Macedonia&city='+this.facility?.municipality+'&street='+this.facility?.address+'&format=json').subscribe(obj => {
     34    this.http.get<any>('https://jankuloski.xyz:8080/https://nominatim.openstreetmap.org/search/?country=Macedonia&city='+this.facility?.municipality+'&street='+this.facility?.address+'&format=json').subscribe(obj => {
    3535      console.log(obj); 
    3636      if(obj.length) {

  • Farmatiko/ClientApp/src/app/dialogs/pharmacy-dialog/pharmacy-dialog.component.ts

    r8eb1e21 r6e6f04b  
    3232
    3333  addMarkers() {
    34     this.http.get<any>('https://nominatim.openstreetmap.org/search/?country=Macedonia&city='+this.pharmacy?.location+'&street='+this.pharmacy?.address+'&format=json').subscribe(obj => {
     34    this.http.get<any>('https://jankuloski.xyz:8080/https://nominatim.openstreetmap.org/search/?country=Macedonia&city='+this.pharmacy?.location+'&street='+this.pharmacy?.address+'&format=json').subscribe(obj => {
    3535      console.log(obj); 
    3636      if(obj.length) {
Note: See TracChangeset for help on using the changeset viewer.