Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: adding ember leaflet #5429

Merged
merged 11 commits into from
Nov 7, 2020
Merged

feat: adding ember leaflet #5429

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b6864fc
adding ember leaflet
maze-runnar Oct 30, 2020
ec327cb
updating as per required
maze-runnar Oct 31, 2020
bb2d856
fix
maze-runnar Oct 31, 2020
9a0b736
finalizing pr
maze-runnar Nov 4, 2020
e3ae689
Merge branch 'development' into leaflet-map
maze-runnar Nov 4, 2020
56b2a9b
Merge branch 'development' into leaflet-map
maze-runnar Nov 6, 2020
48647d5
fix
iamareebjamal Nov 7, 2020
71ad234
fix
iamareebjamal Nov 7, 2020
9d3fb9a
fix
iamareebjamal Nov 7, 2020
57df6de
fix
iamareebjamal Nov 7, 2020
9359051
Merge branch 'development' into leaflet-map
iamareebjamal Nov 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion app/components/public/event-map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,20 @@
import classic from 'ember-classic-decorator';
import { classNames } from '@ember-decorators/component';
import Component from '@ember/component';
import { tracked } from '@glimmer/tracking';

@classic
@classNames('ui', 'stackable', 'grid')
export default class EventMap extends Component {}
export default class EventMap extends Component {
@tracked
lat = this.event.latitude;

@tracked
lng = this.event.longitude;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Read only properties don't need tracked


@tracked
zoom = 4;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this is read only?, it should not have tracked decorator


@tracked
emberConfLocation = [this.event.latitude, this.event.longitude];
}
4 changes: 4 additions & 0 deletions app/styles/components/extras.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ a.link-item {
background-color: rgba(0, 0, 0, .05);
}
}

.leaflet-container {
height: 300px;
}
20 changes: 9 additions & 11 deletions app/templates/components/public/event-map.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
{{#if this.event.isMapShown}}
<div class="eight wide column event-map">
<h1>{{t 'Getting Here'}}</h1>
{{#if (eq this.mapConfig.display 'embed') }}
<iframe title="Map" class="g-map" src="https://maps.google.com/maps?q={{this.event.locationName}}&t=&z=15&ie=UTF8&iwloc=&output=embed" frameborder="0" scrolling="no"></iframe>
{{else}}
<GMap @markersFitMode="live" @lat={{37.744}} @lng={{-122.4367}} @address={{this.event.locationName}} @zoom={{2}} @class="google-maps" as |context|>
{{#g-map-address-marker context address=this.event.locationName as |markerContext|}}
{{#g-map-infowindow markerContext}}
{{this.event.locationName}}
{{/g-map-infowindow}}
{{/g-map-address-marker}}
</GMap>
{{/if}}
<LeafletMap @lat={{this.lat}} @lng={{this.lng}} @zoom={{this.zoom}} as |layers|>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be shown only if event has lat lng. Otherwise, fallback to previous method

<layers.tile @url="https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png"/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use a free to use basemap, this is only free for non-commercial projects

Our basemaps can be used for free in applications and visualizations for non-commercial use. For commercial purposes, you will need an Enterprise license to ensure you have the best basemaps available.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://wiki.openstreetmap.org/wiki/Tiles#Servers

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

<layers.marker @location={{emberConfLocation}} as |marker|>
<marker.popup>
<h3>{{this.event.name}}</h3>
{{this.event.locationName}}
</marker.popup>
</layers.marker>
</LeafletMap>
</div>
{{/if}}
<div class="{{if this.event.isMapShown 'eight' 'sixteen'}} wide column address">
Expand Down
4 changes: 1 addition & 3 deletions app/templates/public/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,7 @@
{{/if}}
<div class="location" id="getting-here">
{{#if this.model.event.locationName}}
<Public::EventMap
@event={{this.model.event}}
@mapConfig={{this.model.mapConfig}} />
<Public::EventMap @event={{this.model.event}} />
{{/if}}
{{#if this.model.event.online}}
<h2>{{t 'Online Event'}}</h2>
Expand Down
2 changes: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@
"fastboot-app-server": "^3.0.0",
"google-material-color": "^1.3.1",
"http-status": "^1.4.2",
"leaflet": "0.7",
"loader.js": "^4.7.0",
"lodash-es": "^4.17.15",
"mini-css-extract-plugin": "^1.2.1",
Expand Down Expand Up @@ -165,6 +166,7 @@
},
"private": true,
"dependencies": {
"ember-leaflet": "^4.1.1",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be in devDependencies?

"ua-parser-js": "^0.7.22"
},
"ember": {
Expand Down
106 changes: 105 additions & 1 deletion yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3311,6 +3311,11 @@ babel-plugin-htmlbars-inline-precompile@^3.0.1:
resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-3.0.1.tgz#e1e38a4087f446578e419a21c112530c8df02345"
integrity sha512-ZiFY0nQjtdMPGIDwp/5LYOs6rCr54QfcSV5nPbrA7C++Fv4Vb2Q/qrKYx78t+dwmARJztnOBlObFk4z8veHxNA==

babel-plugin-htmlbars-inline-precompile@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-3.2.0.tgz#c4882ea875d0f5683f0d91c1f72e29a4f14b5606"
integrity sha512-IUeZmgs9tMUGXYu1vfke5I18yYJFldFGdNFQOWslXTnDWXzpwPih7QFduUqvT+awDpDuNtXpdt5JAf43Q1Hhzg==

babel-plugin-htmlbars-inline-precompile@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-4.2.0.tgz#73e7a199c14db139b9c9aea240e03b7112784c81"
Expand Down Expand Up @@ -6416,7 +6421,7 @@ ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.10.0,
ember-cli-version-checker "^2.1.2"
semver "^5.5.0"

ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.11.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.18.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.20.2, ember-cli-babel@^7.20.5, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.4.0, ember-cli-babel@^7.5.0, ember-cli-babel@^7.7.3:
ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.11.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.18.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.20.2, ember-cli-babel@^7.20.5, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.4.0, ember-cli-babel@^7.5.0, ember-cli-babel@^7.7.3, ember-cli-babel@^7.8.0:
version "7.23.0"
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.23.0.tgz#ec580aa2c115d0810e454dd5c2fffce238284b92"
integrity sha512-ix58DlRDAbGITtdJoRUPcAoQwKLYr/x/kIXjU9u1ATyhmuUjqb+0FDXghOWbkNihGiNOqBBR49+LBgK9AeBcNw==
Expand Down Expand Up @@ -6744,6 +6749,36 @@ ember-cli-htmlbars@^3.0.0, ember-cli-htmlbars@^3.0.1:
json-stable-stringify "^1.0.0"
strip-bom "^3.0.0"

ember-cli-htmlbars@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-3.1.0.tgz#87806c2a0bca2ab52d4fb8af8e2215c1ca718a99"
integrity sha512-cgvRJM73IT0aePUG7oQ/afB7vSRBV3N0wu9BrWhHX2zkR7A7cUBI7KC9VPk6tbctCXoM7BRGsCC4aIjF7yrfXA==
dependencies:
broccoli-persistent-filter "^2.3.1"
hash-for-dep "^1.5.1"
json-stable-stringify "^1.0.1"
strip-bom "^3.0.0"

ember-cli-htmlbars@^4.2.0:
version "4.4.0"
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-4.4.0.tgz#7ca17d5ca8f7550984346d9e6e93da0c3323f8d9"
integrity sha512-ohgctqk7dXIZR4TgN0xRoUYltWhghFJgqmtuswQTpZ7p74RxI9PKx+E8WV/95mGcPzraesvMNBg5utQNvcqgNg==
dependencies:
"@ember/edition-utils" "^1.2.0"
babel-plugin-htmlbars-inline-precompile "^3.2.0"
broccoli-debug "^0.6.5"
broccoli-persistent-filter "^2.3.1"
broccoli-plugin "^3.1.0"
common-tags "^1.8.0"
ember-cli-babel-plugin-helpers "^1.1.0"
fs-tree-diff "^2.0.1"
hash-for-dep "^1.5.1"
heimdalljs-logger "^0.1.10"
json-stable-stringify "^1.0.1"
semver "^6.3.0"
strip-bom "^4.0.0"
walk-sync "^2.0.2"

ember-cli-htmlbars@^5.0.0, ember-cli-htmlbars@^5.1.2, ember-cli-htmlbars@^5.2.0, ember-cli-htmlbars@^5.3.1:
version "5.3.1"
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-5.3.1.tgz#61793964fc2599ce750db9e972ab55c6dd177c48"
Expand Down Expand Up @@ -7218,6 +7253,15 @@ ember-compatibility-helpers@^1.1.1, ember-compatibility-helpers@^1.1.2, ember-co
ember-cli-version-checker "^2.1.1"
semver "^5.4.1"

ember-composability-tools@^0.0.12:
version "0.0.12"
resolved "https://registry.yarnpkg.com/ember-composability-tools/-/ember-composability-tools-0.0.12.tgz#ac7954d4220468af2f431fefd8141d999daa1110"
integrity sha512-twb7I60OSSzHyJnCcl9OFw8OwfHvscHSQrgTFa4u6YNftKgNqXqc/Ejez1HqbG6I/CwGAcCrXquvTNDVSZdxvA==
dependencies:
ember-cli-babel "^7.8.0"
ember-cli-htmlbars "^3.1.0"
ember-in-element-polyfill "^0.2.0"

ember-composable-helpers@^4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/ember-composable-helpers/-/ember-composable-helpers-4.3.0.tgz#afe03e14e20639652bed86b84d91633ede2cb129"
Expand Down Expand Up @@ -7306,6 +7350,15 @@ ember-debug-handlers-polyfill@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ember-debug-handlers-polyfill/-/ember-debug-handlers-polyfill-1.1.1.tgz#e9ae0a720271a834221179202367421b580002ef"

ember-decorators-polyfill@^1.1.5:
version "1.1.5"
resolved "https://registry.yarnpkg.com/ember-decorators-polyfill/-/ember-decorators-polyfill-1.1.5.tgz#49203c302ea4486618ba4866923ec657cf2c9f3d"
integrity sha512-O154i8sLoVjsiKzSqxGRfHGr+N+drT6mRrLDbNgJCnW/V5uLg/ppZFpUsrdxuXnp5Q9us3OfXV1nX2CH+7bUpA==
dependencies:
ember-cli-babel "^7.1.2"
ember-cli-version-checker "^3.1.3"
ember-compatibility-helpers "^1.2.0"

ember-decorators@^6.1.1:
version "6.1.1"
resolved "https://registry.yarnpkg.com/ember-decorators/-/ember-decorators-6.1.1.tgz#6d770f8999cf5a413a1ee459afd520838c0fc470"
Expand Down Expand Up @@ -7377,6 +7430,15 @@ [email protected], "ember-fetch@^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0":
node-fetch "^2.6.0"
whatwg-fetch "^3.4.0"

ember-fn-helper-polyfill@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/ember-fn-helper-polyfill/-/ember-fn-helper-polyfill-1.0.2.tgz#deb035fced77f98b9256ba4eb17694b7a2e2a526"
integrity sha512-T/YG1Do59xvyMCUItqvY61ZJfSLiUsUuykG8C4o9ffrwDuspbquL3eJdLi+NF1dNoihwcIdJHcxLKvwvQB05LQ==
dependencies:
calculate-cache-key-for-tree "^2.0.0"
ember-cli-babel "^7.7.3"
ember-cli-version-checker "^3.1.3"

ember-fullcalendar@^1.8.0:
version "1.8.0"
resolved "https://registry.yarnpkg.com/ember-fullcalendar/-/ember-fullcalendar-1.8.0.tgz#264da8513da5d0db355dcad713111c72d50cc0b9"
Expand Down Expand Up @@ -7419,6 +7481,16 @@ [email protected]:
dependencies:
ember-cli-babel "^7.13.2"

ember-in-element-polyfill@^0.2.0:
version "0.2.2"
resolved "https://registry.yarnpkg.com/ember-in-element-polyfill/-/ember-in-element-polyfill-0.2.2.tgz#d1e7c9cdea7903b668bc4622c106add8d9558df7"
integrity sha512-aWFWTpDU+6mHqQd3Gr0UyrwMXGiGuLBJXYczExNGJsc2zUv/9rDot9HIpMr0sgXtWddzM0Z9Ly1H0sbYZ1ExCA==
dependencies:
debug "^3.1.0"
ember-cli-babel "^7.13.0"
ember-cli-htmlbars "^4.2.0"
ember-cli-version-checker "^2.1.0"

ember-in-element-polyfill@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/ember-in-element-polyfill/-/ember-in-element-polyfill-1.0.0.tgz#10365af6fe31bc59e71ec463ed209d4ba4caecda"
Expand Down Expand Up @@ -7481,6 +7553,33 @@ ember-l10n@^4.3.1:
inquirer "^7.0.4"
shelljs "^0.8.2"

ember-leaflet@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/ember-leaflet/-/ember-leaflet-4.1.1.tgz#8012a2b36a930afafe141a4aa19ebcfe34e1b98b"
integrity sha512-W0RPVmSPh8+NYPRlTzHh+msxlM9wQqBVIfo0226AkaT6qEzyWyxmGeIybJ5i+oQhA+4rEjEuIFlgnfixWMPvuw==
dependencies:
broccoli-funnel "^3.0.3"
broccoli-merge-trees "^4.2.0"
ember-cli-babel "^7.21.0"
ember-cli-htmlbars "^5.2.0"
ember-composability-tools "^0.0.12"
ember-decorators-polyfill "^1.1.5"
ember-fn-helper-polyfill "^1.0.2"
ember-get-config "^0.2.4"
ember-in-element-polyfill "^1.0.0"
ember-invoke-action "^1.5.1"
ember-let-polyfill "^0.1.0"
fastboot-transform "^0.1.3"
resolve "^1.17.0"

ember-let-polyfill@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/ember-let-polyfill/-/ember-let-polyfill-0.1.0.tgz#9d37c610441eb41eaaea3a6782bbd4203f5cf0a9"
integrity sha512-olLHpS7JnqZcfyYRXcdLATYwDIopKA+ZzI8xswzCIcBYoRgoUJY7E/eW84Unu8ea1jtr/Unx+dQrsU+NrNSoBg==
dependencies:
ember-cli-babel "^6.16.0"
ember-cli-version-checker "^2.1.2"

[email protected]:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ember-link-action/-/ember-link-action-2.0.0.tgz#5955ca92dc5515c05023d3bd13876637f2593d02"
Expand Down Expand Up @@ -11125,6 +11224,11 @@ lcid@^1.0.0:
dependencies:
invert-kv "^1.0.0"

[email protected]:
version "0.7.7"
resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-0.7.7.tgz#1e352ba54e63d076451fa363c900890cb2cf75ee"
integrity sha1-HjUrpU5j0HZFH6NjyQCJDLLPde4=

[email protected]:
version "0.0.24"
resolved "https://registry.yarnpkg.com/leek/-/leek-0.0.24.tgz#e400e57f0e60d8ef2bd4d068dc428a54345dbcda"
Expand Down