fix for lat and lng

RomanistHere · Aug 1, 2021 · ce4f64b · ce4f64b
1 parent 69b7199
commit ce4f64b
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 8 deletions.
diff --git a/back-end/controllers/geo.controller.js b/back-end/controllers/geo.controller.js
@@ -204,7 +204,7 @@ exports.geo_add = async (req, res, next) => {
         return res.status(400).json({ error: "User is not logged in" })
 
     const userID = req.session.userID
-    // body.location.coordinates = [body.location.coordinates[1], body.location.coordinates[0]]
+    body.location.coordinates = [body.location.coordinates[1], body.location.coordinates[0]]
 
     try {
         const user = await User.findOne({ email: userID })

diff --git a/css/main-non-crit.css b/css/main-non-crit.css
@@ -935,6 +935,12 @@ textarea {
     list-style-type: square;
 }
 
+.settings__highlight {
+    font-weight: bold;
+    font-size: 80%;
+    font-style: italic;
+}
+
 .setting__item {
     width: 100%;
 }

diff --git a/index.html b/index.html
@@ -1351,7 +1351,7 @@ <h2 class="rating__title title rating__item_text settings__title sidebar__title"
                     <hr>
                     <ul class="settings__list">
                         <li class="setting__item">
-                            <a href="#" class="settings__link rating__title openFiltersBtn">Filters</a>
+                            <a href="#" class="settings__link rating__title openFiltersBtn">Filters <span class="settings__highlight">(new)</span></a>
                         </li>
                         <li class="setting__item">
                             <a href="#" class="settings__link rating__title vizualizeLoadingBtn">

diff --git a/js/db.js b/js/db.js
@@ -123,8 +123,8 @@ const getSinglePointData = async (latlng) => {
 // }
 
 const fetchBoundsData = async (box, zoom, filtersObj = null) => {
-    // preparedBox = box.map(item => [item[1], item[0]])
-    const bounds = JSON.stringify(box)
+    preparedBox = box.map(item => [item[1], item[0]])
+    const bounds = JSON.stringify(preparedBox)
     const filters = JSON.stringify(filtersObj)
     const url = `${path}/geo/read_bounds/${new URLSearchParams({ bounds, zoom, filters })}`
 

diff --git a/js/mapOptimization.js b/js/mapOptimization.js
@@ -127,7 +127,7 @@ const addDataAndDisplay = data => {
         const newObj = {
             ...item,
             geometry: {
-                coordinates: item['location']['coordinates'].reverse(),
+                coordinates: item['location']['coordinates'],
                 type: 'Point'
             },
             type: "Feature"

diff --git a/js/places.js b/js/places.js
@@ -37,7 +37,7 @@ const initPlaces = async () => {
 
     for (let i = 0; i < length; i++) {
         const { coordinates } = places[i].location
-        const [ lat, lng ] = coordinates
+        const [ lng, lat ] = coordinates
 
         const newItem = document.createElement('li')
         newItem.classList.add('places__item')

diff --git a/js/showRatings.js b/js/showRatings.js
@@ -43,7 +43,7 @@ const initRatingPopup = async ({ latlng }) => {
     addClass(ratePopup, 'rating-active')
     $('.rate__popup').focus()
 
-    const { error, data } = await getSinglePointData([ latlng.lat, latlng.lng ])
+    const { error, data } = await getSinglePointData([ latlng.lng, latlng.lat, ])
 
     if (error === 'Location not found') {
         showError('locationNotFound')

diff --git a/ru/index.html b/ru/index.html
@@ -1367,7 +1367,7 @@ <h2 class="rating__title title rating__item_text settings__title sidebar__title"
                     <hr>
                     <ul class="settings__list">
                         <li class="setting__item">
-                            <a href="#" class="settings__link rating__title openFiltersBtn">Фильтры</a>
+                            <a href="#" class="settings__link rating__title openFiltersBtn">Фильтры <span class="settings__highlight">(new)</span></a>
                         </li>
                         <li class="setting__item">
                             <a href="#" class="settings__link rating__title vizualizeLoadingBtn">