diff --git a/.discourse-compatibility b/.discourse-compatibility
new file mode 100644
index 00000000..13cb7d92
--- /dev/null
+++ b/.discourse-compatibility
@@ -0,0 +1 @@
+3.1.999: ee6a34482cc35006a11dc4acb338ee7c998c5774
diff --git a/.rubocop.yml b/.rubocop.yml
index 7f4f0603..e5a3e45d 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -9,5 +9,5 @@ RSpec/DescribeClass:
AllCops:
Exclude:
- - '**/gems/**/*'
- - '**/vendor/**/*'
\ No newline at end of file
+ - "**/gems/**/*"
+ - "**/vendor/**/*"
diff --git a/assets/javascripts/discourse/components/location-selector.js.es6 b/assets/javascripts/discourse/components/location-selector.js.es6
index fabb425a..fbe057d8 100644
--- a/assets/javascripts/discourse/components/location-selector.js.es6
+++ b/assets/javascripts/discourse/components/location-selector.js.es6
@@ -5,6 +5,7 @@ import {
} from "../lib/location-utilities";
import { observes } from "discourse-common/utils/decorators";
import TextField from "discourse/components/text-field";
+import { findRawTemplate } from "discourse-common/lib/raw-templates";
export default TextField.extend({
autocorrect: false,
@@ -22,17 +23,10 @@ export default TextField.extend({
val = location;
}
- window.__DISCOURSE_RAW_TEMPLATES = requirejs(
- "discourse-common/lib/raw-templates"
- ).__DISCOURSE_RAW_TEMPLATES;
-
- let template =
- window.__DISCOURSE_RAW_TEMPLATES["javascripts/location-autocomplete"];
-
$(self.element)
.val(val)
.autocomplete({
- template,
+ template: findRawTemplate("javascripts/location-autocomplete"),
single: true,
updateData: false,
diff --git a/assets/javascripts/discourse/components/locations-map.hbs b/assets/javascripts/discourse/components/locations-map.hbs
new file mode 100644
index 00000000..1a294703
--- /dev/null
+++ b/assets/javascripts/discourse/components/locations-map.hbs
@@ -0,0 +1,102 @@
+
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/locations-map.js b/assets/javascripts/discourse/components/locations-map.js
new file mode 100644
index 00000000..3430af9a
--- /dev/null
+++ b/assets/javascripts/discourse/components/locations-map.js
@@ -0,0 +1,584 @@
+import { action, computed } from "@ember/object";
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+import {
+ addCircleMarkersToMap,
+ addMarkersToMap,
+ generateMap,
+ setupMap,
+} from "../lib/map-utilities";
+import { tracked } from "@glimmer/tracking";
+import { ajax } from "discourse/lib/ajax";
+import { findOrResetCachedTopicList } from "discourse/lib/cached-topic-list";
+
+export default class LocationMapComponent extends Component {
+ @service siteSettings;
+ @service currentUser;
+ @service store;
+
+ @tracked mapToggle = "expand";
+ @tracked expanded = false;
+ @tracked showExpand = !this.args.disableExpand;
+ @tracked showAttribution = false;
+ @tracked runSetup = true;
+ @tracked showSearch = false;
+ @tracked locations = this.args.locations || [];
+ @tracked filteredLocations = [];
+ @tracked mapType = "category";
+ @tracked topic = {};
+ @tracked topicList = {};
+ @tracked user = {};
+ @tracked userList = {};
+ @tracked mapObjs = {};
+ @tracked markers = null;
+ @tracked searchFilter = "";
+ @tracked searchFilterType = "name";
+
+ @action
+ setup() {
+ this.getLocationData().then(() => {
+ if (!Object.keys(this.mapObjs).length) {
+ this.mapObjs = this.initializeMap();
+ } else {
+ if (this.markers) {
+ this.markers.clearLayers();
+ this.markers = null;
+ }
+ }
+ this.onMapLoad();
+ this.locations = [];
+ this.gatherLocations();
+
+ this.setupLocationMap();
+
+ // TODO handle sidebar
+ // triggered in sidebar-container component in layouts plugin
+ // this.appEvents.on("sidebars:after-render", () => {
+ // state.runSetup = true;
+ // state.showSearch = false;
+ // this.scheduleRerender();
+ // });
+ });
+ }
+
+ get isTopicListType() {
+ return this.args.mapType === "topicList";
+ }
+
+ get isUserListType() {
+ return this.args.mapType === "userList";
+ }
+
+ get isMultipleLocations() {
+ return (
+ this.args.mapType === "topicList" || this.args.mapType === "userList"
+ );
+ }
+
+ @action
+ changeFilterType(event) {
+ this.searchFilterType = event.target.value;
+ }
+
+ @action
+ filterLocations(event) {
+ this.searchFilter = event.target.value;
+
+ if (this.markers) {
+ this.markers.clearLayers();
+ this.markers = null;
+ }
+
+ this.gatherLocations();
+
+ this.setupLocationMap();
+
+ // TODO handle sidebar
+ // triggered in sidebar-container component in layouts plugin
+ // this.appEvents.on("sidebars:after-render", () => {
+ // state.runSetup = true;
+ // state.showSearch = false;
+ // this.scheduleRerender();
+ // });
+ }
+
+ async getLocationData() {
+ let filter = "";
+ let category = this.args.category;
+
+ if (this.args.mapType === "topicList") {
+ if (category) {
+ filter = `c/${category.slug}/${category.id}/l/map`;
+
+ this.topicList =
+ (await findOrResetCachedTopicList(this.session, filter)) ||
+ this.store.findFiltered("topicList", { filter });
+ } else {
+ let result = await ajax("map.json");
+ this.topicList = result.topic_list;
+ }
+ }
+
+ if (this.args.mapType === "userList") {
+ let params = { period: "location" };
+ this.userList = await this.store.find("directoryItem", params);
+ }
+ }
+
+ gatherLocations() {
+ this.filteredLocations = [];
+ // gather map data and prepare raw marker data
+ this.mapType = this.args.mapType;
+ this.topic = this.args.topic;
+ this.user = this.args.user;
+
+ if (
+ this.args.locations &&
+ this.locations.length !== this.args.locations.length
+ ) {
+ this.args.locations.forEach((l) => {
+ if (l && this.validGeoLocation(l)) {
+ this.locations.push(l);
+ }
+ });
+ }
+
+ if (this.addTopicMarker(this.topic, this.locations)) {
+ this.filteredLocations.push(this.topicMarker(this.topic));
+ }
+
+ if (
+ this.mapType === "topicList" &&
+ this.topicList &&
+ this.topicList.topics
+ ) {
+ this.topicList.topics.forEach((t) => {
+ if (this.addTopicMarker(t, this.locations)) {
+ this.filteredLocations.push(this.topicMarker(t));
+ }
+ });
+ }
+
+ if (
+ this.mapType === "user" &&
+ this.addUserMarker(this.user, this.locations)
+ ) {
+ this.filteredLocations.push(this.userMarker(this.user));
+ }
+
+ if (this.mapType === "userList" && this.userList) {
+ this.userList.forEach((u) => {
+ if (this.addUserMarker(u.user, this.locations)) {
+ this.filteredLocations.push(this.userMarker(u.user));
+ }
+ });
+ }
+ }
+
+ addTopicMarker(topic) {
+ // confirm if topic marker to the data should be added
+ if (
+ !topic ||
+ !topic.location ||
+ !topic.location.geo_location ||
+ !this.validGeoLocation(topic.location.geo_location) ||
+ topic.location.hide_marker ||
+ this.locations.find((l) => l["topic_id"] === topic.id)
+ ) {
+ return false;
+ }
+ if (this.isTopicListType) {
+ if (this.searchFilter !== "") {
+ if (this.searchFilterType === "name") {
+ if (topic.location.name) {
+ if (
+ !(
+ topic.location.name.toLowerCase().indexOf(this.searchFilter) >
+ -1
+ )
+ ) {
+ return false;
+ }
+ } else {
+ return false;
+ }
+ }
+ if (this.searchFilterType === "address") {
+ if (topic.location.address) {
+ if (
+ !(
+ topic.location.address
+ .toLowerCase()
+ .indexOf(this.searchFilter) > -1
+ )
+ ) {
+ return false;
+ }
+ } else {
+ return false;
+ }
+ }
+ if (this.searchFilterType === "city") {
+ if (topic.location.city) {
+ if (
+ !(
+ topic.location.city.toLowerCase().indexOf(this.searchFilter) >
+ -1
+ )
+ ) {
+ return false;
+ }
+ } else {
+ return false;
+ }
+ }
+ if (this.searchFilterType === "street") {
+ if (topic.location.street) {
+ if (
+ !(
+ topic.location.street.toLowerCase().indexOf(this.searchFilter) >
+ -1
+ )
+ ) {
+ return false;
+ }
+ } else {
+ return false;
+ }
+ }
+ }
+ }
+ // confirmed
+ return true;
+ }
+
+ addUserMarker(user) {
+ if (
+ !user ||
+ !this.validGeoLocation(user.geo_location) ||
+ this.locations.find((l) => l["user_id"] === user.id)
+ ) {
+ return false;
+ }
+ if (this.searchFilter !== "") {
+ if (
+ this.searchFilterType === "username" &&
+ !(user.username.toLowerCase().indexOf(this.searchFilter) > -1)
+ ) {
+ return false;
+ }
+ if (
+ this.searchFilterType === "name" &&
+ !(user.name.toLowerCase().indexOf(this.searchFilter) > -1)
+ ) {
+ return false;
+ }
+ }
+
+ //confirmed
+ return true;
+ }
+
+ validGeoLocation(geoLocation) {
+ return geoLocation && geoLocation.lat && geoLocation.lon;
+ }
+
+ topicMarker(topic) {
+ let location = topic.location;
+
+ if (!location["marker"] && !location["circle_marker"]) {
+ location["marker"] = {
+ title: topic.fancy_title,
+ routeTo: `/t/${topic.slug}/${topic.id}`,
+ };
+ }
+
+ if (
+ this.siteSettings.location_map_marker_category_color &&
+ topic.category &&
+ topic.category.color
+ ) {
+ location["marker"]["color"] = topic.category.color;
+ location["marker"]["class"] = topic.category.slug;
+ }
+
+ location["topic_id"] = topic.id;
+
+ return location;
+ }
+
+ userMarker(user) {
+ let location = {};
+
+ location["marker"] = {
+ title: user.username,
+ avatar: user.avatar_template,
+ routeTo: "/u/" + user.username,
+ };
+
+ location["user_id"] = user.id;
+
+ location["geo_location"] = user.geo_location;
+
+ return location;
+ }
+
+ locationPresent(locations, location) {
+ return (
+ locations.filter((l) => {
+ if (location.geo_location) {
+ return false;
+ }
+ if (location.geo_location.lat && location.geo_location.lon) {
+ return (
+ l.geo_location.lat === location.geo_location.lat &&
+ l.geo_location.lon === location.geo_location.lon
+ );
+ } else if (location.geo_location.boundingbox) {
+ return (
+ l.geo_location.boundingbox === location.geo_location.boundingbox
+ );
+ }
+ }).length > 0
+ );
+ }
+
+ addMarkers() {
+ const map = this.mapObjs.map;
+ const filteredLocations = this.filteredLocations;
+ const settings = this.siteSettings;
+
+ let rawMarkers = [];
+ let rawCircleMarkers = [];
+
+ if (filteredLocations && filteredLocations.length > 0) {
+ filteredLocations.forEach((l) => {
+ if (l && l.geo_location) {
+ let marker = {
+ lat: l.geo_location.lat,
+ lon: l.geo_location.lon,
+ options: {},
+ };
+
+ if (l.marker) {
+ marker["options"] = l.marker;
+ rawMarkers.push(marker);
+ }
+
+ if (l.circle_marker) {
+ marker["options"] = l.circle_marker;
+ rawCircleMarkers.push(marker);
+ }
+ }
+ });
+ }
+
+ let markers = null;
+
+ if (rawCircleMarkers && rawCircleMarkers.length > 0) {
+ addCircleMarkersToMap(rawCircleMarkers, map, this);
+ }
+
+ if (rawMarkers && rawMarkers.length > 0) {
+ markers = addMarkersToMap(
+ rawMarkers,
+ map,
+ settings.location_map_maker_cluster_enabled,
+ settings.location_map_marker_cluster_multiplier,
+ settings.location_user_avatar,
+ settings.location_hide_labels
+ );
+ }
+
+ return markers;
+ }
+
+ setupLocationMap() {
+ // setup map
+
+ const mapObjs = this.mapObjs;
+ const map = mapObjs.map;
+ this.markers = this.addMarkers();
+ const topic = this.topic;
+ const category = this.args.category;
+ const zoom = this.zoom;
+ const center = this.args.center;
+ let boundingbox = null;
+
+ if (
+ category &&
+ category.custom_fields.location &&
+ category.custom_fields.location.geo_location &&
+ category.custom_fields.location.geo_location.boundingbox
+ ) {
+ boundingbox = category.custom_fields.location.geo_location.boundingbox;
+ }
+
+ if (
+ topic &&
+ topic.location &&
+ topic.location.geo_location &&
+ topic.location.geo_location.boundingbox
+ ) {
+ boundingbox = topic.location.geo_location.boundingbox;
+ }
+
+ map.invalidateSize(false);
+ setupMap(map, this.markers, boundingbox, zoom, center, this.siteSettings);
+ //map.invalidateSize();
+ }
+
+ @action
+ toggleAttribution() {
+ const map = this.mapObjs.map;
+ const attribution = this.mapObjs.attribution;
+
+ if (!this.showAttribution) {
+ map.addControl(attribution);
+ } else {
+ if ($(".locations-map .leaflet-control-attribution").is(":visible")) {
+ map.removeControl(attribution);
+ }
+ }
+
+ this.showAttribution = !this.showAttribution;
+ }
+
+ @computed("args.category")
+ get showEditButton() {
+ return false;
+ // TODO
+ //return this.args.category && this.args.category.can_edit;
+ }
+
+ @action
+ toggleSearch() {
+ // TODO
+ // scheduleOnce("afterRender", this, () => {
+ // // resetinng the val puts the cursor at the end of the text on focus
+ // const $input = $("#map-search-input");
+ // const val = $input.val();
+ // $input.focus();
+ // $input.val("");
+ // $input.val(val);
+ // });
+ this.showSearch = !this.showSearch;
+ }
+
+ @action
+ toggleExpand() {
+ const map = this.mapObjs.map;
+ this.expanded = !this.expanded;
+
+ if (this.expanded) {
+ this.mapToggle = "compress";
+ map.setZoom(this.siteSettings.location_map_expanded_zoom);
+ } else {
+ this.mapToggle = "expand";
+ this.setupLocationMap();
+ }
+ map.invalidateSize();
+ }
+
+ // TODO
+ // @action
+ // editCategory() {
+ // const appRoute = this.register.lookup("route:application");
+ // appRoute.send("editCategory", this.category);
+ // };
+
+ onMapLoad() {
+ // find our container
+ const locationsMapDiv = document.getElementById("locations-map");
+
+ // check if there's a map in it
+ const mapContainerDivs =
+ locationsMapDiv.querySelector(".leaflet-container");
+
+ // if not add it
+ if (mapContainerDivs === null) {
+ locationsMapDiv.appendChild(this.mapObjs.element);
+ }
+ }
+
+ initializeMap() {
+ // initialise map
+ let mapObjs;
+
+ const center = this.args.center;
+ const clickable = this.args.clickable;
+ const zoom = this.args.zoom;
+ let opts = {};
+ if (zoom) {
+ opts["zoom"] = zoom;
+ }
+ if (center) {
+ opts["center"] = center;
+ }
+ if (clickable) {
+ opts["clickable"] = clickable;
+ }
+
+ mapObjs = generateMap(this.siteSettings, opts);
+
+ return mapObjs;
+ }
+
+ //TODO
+ // if (attrs.showAvatar && user) {
+ // let size = state.expanded ? "large" : "medium";
+ // contents.push(
+ // h(
+ // "a.avatar-wrapper",
+ // {
+ // attributes: { "data-user-card": user.get("username") },
+ // },
+ // avatarImg(size, {
+ // template: user.get("avatar_template"),
+ // username: user.get("username"),
+ // })
+ // )
+ // );
+ // }
+
+ //TOOD
+ // if (attrs.search) {
+ // if (state.showSearch) {
+ // let locations = state.locations;
+ // let current = null;
+ // if (attrs.category && attrs.category.location) {
+ // current = attrs.category.location;
+ // }
+ // if (attrs.topic && attrs.topic.location) {
+ // current = attrs.topic.location;
+ // }
+ // contents.push(
+ // this.attach("map-search", {
+ // locations,
+ // current,
+ // }),
+ // this.attach("button", {
+ // className: "btn btn-map hide-search",
+ // action: "toggleSearch",
+ // icon: "times",
+ // })
+ // );
+ // } else {
+ // contents.push(
+ // this.attach("link", {
+ // className: "btn btn-map search",
+ // action: "toggleSearch",
+ // icon: "search",
+ // })
+ // );
+ // }
+ // }
+
+ //TODO
+ // if (attrs.extraWidgets) {
+ // const extraWidgets = attrs.extraWidgets.map((w) => {
+ // return this.attach(w.widget, w.attrs);
+ // });
+ // contents.push(...extraWidgets);
+ // }
+}
diff --git a/assets/javascripts/discourse/components/map-component.js.es6 b/assets/javascripts/discourse/components/map-component.js.es6
deleted file mode 100644
index 9157ad75..00000000
--- a/assets/javascripts/discourse/components/map-component.js.es6
+++ /dev/null
@@ -1,57 +0,0 @@
-import MountWidget from "discourse/components/mount-widget";
-import { observes, on } from "discourse-common/utils/decorators";
-import { later, scheduleOnce } from "@ember/runloop";
-
-export default MountWidget.extend({
- classNameBindings: [":map-component", ":map-container", "size"],
- widget: "map",
- clickable: false,
-
- buildArgs() {
- let args = this.getProperties(
- "category",
- "topic",
- "user",
- "locations",
- "clickable",
- "topicList",
- "userList",
- "search",
- "showAvatar",
- "size",
- "center",
- "zoom"
- );
-
- if (this.get("geoLocation")) {
- if (!args["locations"]) {
- args["locations"] = [];
- }
- args["locations"].push({ geo_location: this.get("geoLocation") });
- }
-
- return args;
- },
-
- @on("didInsertElement")
- setupOnRender() {
- this.scheduleSetup();
- },
-
- @observes(
- "topicList.[]",
- "category",
- "geoLocation",
- "geoLocations.[]",
- "userList.[]"
- )
- refreshMap() {
- this.queueRerender();
- this.scheduleSetup();
- },
-
- scheduleSetup() {
- scheduleOnce("afterRender", () => this.appEvents.trigger("dom:clean"));
- later(() => this.appEvents.trigger("sidebars:after-render"));
- },
-});
diff --git a/assets/javascripts/discourse/components/user-location.hbs b/assets/javascripts/discourse/components/user-location.hbs
new file mode 100644
index 00000000..a6ccbe90
--- /dev/null
+++ b/assets/javascripts/discourse/components/user-location.hbs
@@ -0,0 +1,23 @@
+
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/user-location.js b/assets/javascripts/discourse/components/user-location.js
new file mode 100644
index 00000000..4b693c9a
--- /dev/null
+++ b/assets/javascripts/discourse/components/user-location.js
@@ -0,0 +1,45 @@
+import { action } from "@ember/object";
+import Component from "@glimmer/component";
+import { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
+import I18n from "I18n";
+import { geoLocationFormat } from "../lib/location-utilities";
+
+export default class LocationMapComponent extends Component {
+ @service siteSettings;
+ @service site;
+ @tracked showMap = false;
+
+ get mapButtonLabel() {
+ return I18n.t(`location.geo.${this.showMap ? "hide" : "show"}_map`);
+ }
+
+ get showMapButtonLabel() {
+ return this.args.formFactor !== "card" && !this.site.mobileView;
+ }
+
+ get userLocation() {
+ let locationText = "";
+ if (this.args.user && this.args.user.geo_location) {
+ let format = this.siteSettings.location_user_profile_format.split("|");
+ let opts = {};
+
+ if (format.length && format[0]) {
+ opts["geoAttrs"] = format;
+ locationText = geoLocationFormat(
+ this.args.user.geo_location,
+ this.site.country_codes,
+ opts
+ );
+ } else {
+ locationText = this.args.user.geo_location.address;
+ }
+ }
+ return locationText;
+ }
+
+ @action
+ toggleMap() {
+ this.showMap = !this.showMap;
+ }
+}
diff --git a/assets/javascripts/discourse/connectors/user-card-location-and-website/replace-location.hbs b/assets/javascripts/discourse/connectors/user-card-location-and-website/replace-location.hbs
index 74b10592..4a4e9e47 100644
--- a/assets/javascripts/discourse/connectors/user-card-location-and-website/replace-location.hbs
+++ b/assets/javascripts/discourse/connectors/user-card-location-and-website/replace-location.hbs
@@ -2,10 +2,7 @@
{{#if showUserLocation}}
- {{mount-widget
- widget="user-location"
- args=(hash user=user formFactor="card")
- }}
+
{{/if}}
{{#if user.website_name}}
diff --git a/assets/javascripts/discourse/connectors/user-location-and-website/replace-location.hbs b/assets/javascripts/discourse/connectors/user-location-and-website/replace-location.hbs
index b61af866..c0d6c19d 100644
--- a/assets/javascripts/discourse/connectors/user-location-and-website/replace-location.hbs
+++ b/assets/javascripts/discourse/connectors/user-location-and-website/replace-location.hbs
@@ -2,10 +2,7 @@
{{#if showUserLocation}}
- {{mount-widget
- widget="user-location"
- args=(hash user=model formFactor="profile")
- }}
+
{{/if}}
{{#if model.website_name}}
diff --git a/assets/javascripts/discourse/initializers/location-edits.js.es6 b/assets/javascripts/discourse/initializers/location-edits.js.es6
index 99158387..83c48473 100644
--- a/assets/javascripts/discourse/initializers/location-edits.js.es6
+++ b/assets/javascripts/discourse/initializers/location-edits.js.es6
@@ -170,7 +170,7 @@ export default {
category.get("custom_fields.location_enabled") &&
this.siteSettings.location_category_map_filter
) {
- views.push({ name: I18n.t("filters.map.title"), value: "map" });
+ views.push({ name: I18n.t("filters.map.label"), value: "map" });
}
return views;
@@ -183,23 +183,10 @@ export default {
api.modifyClass(`route:discovery.${route}`, {
pluginId: "locations-plugin",
- afterModel(model) {
- if (!this.siteSettings.location_category_map_filter) {
- this.replaceWith(`/c/${this.Category.slugFor(model.category)}`);
- }
- return this._super(...arguments);
- },
+ afterModel() {
+ this.templateName = "discovery/map";
- renderTemplate() {
- let navTemplate =
- this.routeName.indexOf("Category") > -1
- ? "navigation/category"
- : "navigation/default";
- this.render(navTemplate, { outlet: "navigation-bar" });
- this.render("discovery/map", {
- outlet: "list-container",
- controller: "discovery/topics",
- });
+ return this._super(...arguments);
},
});
});
@@ -263,14 +250,14 @@ export default {
buildList(category, args) {
let items = this._super(category, args);
- if (category) {
- items = items.reject((item) => item.name === "map"); // Don't show Site Level "/map"
- if (
- category.custom_fields.location_enabled &&
- category.siteSettings.location_category_map_filter
- ) {
- items.push(NavItem.fromText("map", args)); // Show category level "/map" instead
- }
+ // Don't show Site Level "/map"
+ if (
+ typeof category !== "undefined" &&
+ category &&
+ category.custom_fields.location_enabled &&
+ category.siteSettings.location_category_map_filter
+ ) {
+ items.push(NavItem.fromText("map", args)); // Show category level "/map" instead
}
return items;
diff --git a/assets/javascripts/discourse/initializers/location-map-edits.js.es6 b/assets/javascripts/discourse/initializers/location-map-edits.js.es6
index eedc33c0..d393b24d 100644
--- a/assets/javascripts/discourse/initializers/location-map-edits.js.es6
+++ b/assets/javascripts/discourse/initializers/location-map-edits.js.es6
@@ -1,5 +1,6 @@
import { withPluginApi } from "discourse/lib/plugin-api";
import { default as discourseComputed } from "discourse-common/utils/decorators";
+import I18n from "I18n";
const PLUGIN_ID = "locations-plugin";
@@ -9,9 +10,21 @@ export default {
withPluginApi("0.8.12", (api) => {
const siteSettings = container.lookup("site-settings:main");
- if (siteSettings.location_hamburger_menu_map_link) {
- api.decorateWidget("hamburger-menu:generalLinks", () => {
- return { route: "discovery.map", label: "filters.map.title" };
+ if (siteSettings.location_sidebar_menu_map_link) {
+ api.addCommunitySectionLink({
+ name: "map",
+ route: "discovery.map",
+ title: I18n.t("filters.map.title"),
+ text: I18n.t("filters.map.label"),
+ });
+ }
+
+ if (siteSettings.location_users_map) {
+ api.addCommunitySectionLink({
+ name: "users map",
+ route: "users.user-map",
+ title: I18n.t("directory.map.title"),
+ text: I18n.t("directory.map.title"),
});
}
diff --git a/assets/javascripts/discourse/lib/map-utilities.js.es6 b/assets/javascripts/discourse/lib/map-utilities.js.es6
index deb63ef5..6e5124d0 100644
--- a/assets/javascripts/discourse/lib/map-utilities.js.es6
+++ b/assets/javascripts/discourse/lib/map-utilities.js.es6
@@ -138,7 +138,6 @@ const buildMarker = function (
html: `
+
{{/if}}
{{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/discovery/map.hbs b/assets/javascripts/discourse/templates/discovery/map.hbs
index c90f0c4e..0e8997c5 100644
--- a/assets/javascripts/discourse/templates/discovery/map.hbs
+++ b/assets/javascripts/discourse/templates/discovery/map.hbs
@@ -1 +1,17 @@
-{{map-component topicList=model}}
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/location-autocomplete.raw.hbs b/assets/javascripts/discourse/templates/location-autocomplete.hbr
similarity index 88%
rename from assets/javascripts/discourse/templates/location-autocomplete.raw.hbs
rename to assets/javascripts/discourse/templates/location-autocomplete.hbr
index a3d66481..97cf40cd 100644
--- a/assets/javascripts/discourse/templates/location-autocomplete.raw.hbs
+++ b/assets/javascripts/discourse/templates/location-autocomplete.hbr
@@ -8,7 +8,7 @@
{{i18n "location.geo.desc" provider=o.provider}}
{{else}}
- {{geo-location-format o geoAttrs=o.geoAttrs}}
+ {{geo-location-format o.address geoAttrs=o.geoAttrs}}
{{#if o.showType}}
{{#if o.type}}
diff --git a/assets/javascripts/discourse/templates/users/user-map.hbs b/assets/javascripts/discourse/templates/users/user-map.hbs
index 356d2868..2b569b20 100644
--- a/assets/javascripts/discourse/templates/users/user-map.hbs
+++ b/assets/javascripts/discourse/templates/users/user-map.hbs
@@ -19,5 +19,7 @@
- {{map-component userList=userList}}
+
+