fixed mapping

server/json_databases/geojson/nav_path.json

@@ -1 +1 @@
-{"type": "FeatureCollection", "features": [{"type": "Feature", "geometry": {"type": "LineString", "coordinates": [[-95.08171731249612, 29.564801074268402], [-95.0817141067597, 29.564811937283455], [-95.08171086272411, 29.564820933377636], [-95.08170758295314, 29.564828187529002], [-95.08170427001075, 29.564833824715617], [-95.08170092646077, 29.564837969915533], [-95.08169755486712, 29.56484074810683], [-95.08169415779363, 29.56484228426754], [-95.08169073780422, 29.564842703375746], [-95.08168729746276, 29.564842130409495], [-95.08168383933314, 29.56484069034686], [-95.0816803659792, 29.564838508165884], [-95.08167687996485, 29.564835708844644], [-95.08167338385395, 29.56483241736119], [-95.08166988021043, 29.564828758693587], [-95.08166637159812, 29.564824857819886], [-95.08166286058089, 29.564820839718163], [-95.08165934972266, 29.564816829366464], [-95.08165584158729, 29.564812951742855], [-95.08165233873865, 29.564809331825398], [-95.08164884374064, 29.564806094592146], [-95.08164535915712, 29.564803365021174], [-95.08164188746349, 29.5648012637773], [-95.08163842910004, 29.564799812321272], [-95.08163498247184, 29.564798932909703], [-95.08163154589556, 29.56479854348599], [-95.08162811768784, 29.56479856199354], [-95.0816246961653, 29.56479890637575], [-95.08162127964461, 29.56479949457602], [-95.08161786644239, 29.564800244537746], [-95.08161445487525, 29.564801074204336], [-95.08161104325988, 29.564801901519186], [-95.08160762991291, 29.56480264442569], [-95.08160421330149, 29.5648032282051], [-95.081600793203, 29.564803642005018], [-95.0815973700694, 29.564803907857442], [-95.08159394435826, 29.56480404806616], [-95.08159051652716, 29.564804084934934], [-95.0815870870336, 29.56480404076754], [-95.08158365633514, 29.56480393786775], [-95.08158022488936, 29.56480379853934], [-95.08157679315381, 29.564803645086087], [-95.08157336158604, 29.564803499811756], [-95.08156993064358, 29.564803385020124], [-95.08156650068327, 29.564803318104588], [-95.081563071659, 29.56480329681703], [-95.08155964342389, 29.564803313998958], [-95.08155621583113, 29.564803362491872], [-95.08155278873383, 29.564803435137296], [-95.08154936198517, 29.56480352477672], [-95.08154593543829, 29.564803624251667], [-95.08154250894631, 29.56480372640363], [-95.08153908236244, 29.564803824074122], [-95.08153565553978, 29.564803910104647], [-95.08153222833222, 29.56480397737184], [-95.08152880068081, 29.56480402300268], [-95.08152537269598, 29.564804052378943], [-95.08152194450751, 29.56480407183082], [-95.0815185162453, 29.564804087688522], [-95.0815150880392, 29.564804106282235], [-95.08151166001902, 29.564804133942168], [-95.08150823231462, 29.564804176998514], [-95.0815048050559, 29.564804241781466], [-95.08150137837265, 29.56480433462124], [-95.08149795239473, 29.56480446184802], [-95.08149452724155, 29.56480462928175], [-95.08149110279173, 29.564804831006377], [-95.0814876786832, 29.56480504936986], [-95.08148425454343, 29.56480526620989], [-95.08148082999986, 29.56480546336418], [-95.08147740467994, 29.56480562267042], [-95.08147397821116, 29.564805725966306], [-95.08147055022096, 29.564805755089537], [-95.08146712033678, 29.564805691877815], [-95.08146368818609, 29.564805518168832], [-95.08146025339634, 29.56480521580029], [-95.08145681571682, 29.56480477254998], [-95.08145337595734, 29.564804227896495], [-95.08144993547367, 29.56480364793884], [-95.08144649562618, 29.56480309899602], [-95.08144305777519, 29.564802647387044], [-95.08143962328101, 29.56480235943093], [-95.08143619350398, 29.564802301446676], [-95.08143276980441, 29.56480253975329], [-95.08142935354266, 29.5648031406698], [-95.08142594607902, 29.564804170515192], [-95.08142254877386, 29.564805695608484], [-95.08141916253454, 29.56480776018733], [-95.08141578645672, 29.56481032016395], [-95.08141241918314, 29.564813309369217], [-95.08140905935649, 29.564816661633987], [-95.0814057056195, 29.56482031078914], [-95.08140235661493, 29.564824190665533], [-95.08139901098544, 29.564828235094037], [-95.08139566737378, 29.564832377905525], [-95.0813923244227, 29.56483655293085], [-95.08138898077485, 29.56484069400089], [-95.08138563507747, 29.564844735164172], [-95.08138228651798, 29.564848636806275], [-95.08137893533296, 29.564852410463267], [-95.08137558187964, 29.564856073548086], [-95.08137222651519, 29.564859643473653], [-95.08136886959676, 29.5648631376529], [-95.08136551148156, 29.564866573498758], [-95.08136215252676, 29.564869968424155], [-95.08135879308954, 29.564873339842023], [-95.08135543352707, 29.564876705165286], [-95.08135207419654, 29.56488008180688], [-95.0813487154462, 29.564883486744414], [-95.0813453574189, 29.56488692694305], [-95.08134200005216, 29.564890399355534], [-95.08133864327453, 29.564893900499282], [-95.08133528701458, 29.564897426891697], [-95.08133193120086, 29.5649009750502], [-95.08132857576196, 29.564904541492204], [-95.08132522062643, 29.564908122735122], [-95.08132186572283, 29.564911715296372], [-95.08131851097971, 29.564915315693366], [-95.08131515632567, 29.564918920443514], [-95.08131180168927, 29.564922526064233], [-95.08130844699906, 29.564926129072944], [-95.08130509218358, 29.56492972598705], [-95.08130173717144, 29.56493331332397], [-95.08129838189119, 29.564936887601114], [-95.08129502627136, 29.564940445335903], [-95.08129167024057, 29.564943983045747], [-95.08128831372734, 29.56494749724806], [-95.08128495666026, 29.564950984460257], [-95.08128159896788, 29.564954441199756], [-95.08127824057877, 29.56495786398396]]}, "properties": {"name": "Rover Path"}}]}
+{"type": "FeatureCollection", "features": [{"type": "Feature", "geometry": {"type": "LineString", "coordinates": [[-95.08182400577368, 29.56461201871982], [-95.08182407855739, 29.564615595699582], [-95.0818241515221, 29.564619172688516], [-95.08182422464876, 29.564622749685668], [-95.08182429791822, 29.56462632669005], [-95.0818243713114, 29.564629903700705], [-95.08182444480917, 29.564633480716665], [-95.08182451839245, 29.564637057736952], [-95.08182459204211, 29.564640634760607], [-95.08182466573903, 29.564644211786657], [-95.08182473946414, 29.56464778881413], [-95.08182481319831, 29.564651365842064], [-95.08182488692243, 29.56465494286948], [-95.08182496061742, 29.564658519895424], [-95.08182503426414, 29.564662096918916], [-95.0818251078435, 29.564665673938983], [-95.08182518133637, 29.56466925095467], [-95.08182525472368, 29.564672827964994], [-95.08182532798627, 29.564676404968996], [-95.0818254011051, 29.564679981965703], [-95.081825474061, 29.564683558954144], [-95.0818255468349, 29.564687135933358], [-95.08182561942999, 29.564690712903495], [-95.0818256919255, 29.564694289868584], [-95.08182576441702, 29.56469786683347], [-95.08182583700005, 29.564701443802992], [-95.08182590977016, 29.564705020781993], [-95.08182598282288, 29.564708597775326], [-95.08182605625372, 29.564712174787832], [-95.08182613015825, 29.564715751824355], [-95.08182620463198, 29.56471932888973], [-95.08182627977047, 29.564722905988816], [-95.08182635565441, 29.5647264831257], [-95.08182643212297, 29.564730060292227], [-95.08182650881882, 29.56473363747028], [-95.08182658537893, 29.564737214641436], [-95.08182666144026, 29.564740791787305], [-95.08182673663974, 29.56474436888947], [-95.08182681061436, 29.56474794592952], [-95.08182688300107, 29.564751522889043], [-95.08182695343683, 29.56475509974964], [-95.08182702155857, 29.56475867649289], [-95.08182708700363, 29.56476225310042], [-95.08182714979492, 29.564765829573364], [-95.08182721108376, 29.564769405970132], [-95.0818272722268, 29.564772982359504], [-95.08182733458067, 29.564776558810266], [-95.08182739950198, 29.56478013539121], [-95.08182746834736, 29.564783712171142], [-95.08182754247345, 29.564787289218845], [-95.08182762323686, 29.5647908666031], [-95.08182771199424, 29.564794444392717], [-95.08182781010217, 29.56479802265648], [-95.08182791864775, 29.564801601449506], [-95.08182803514887, 29.56480518064594], [-95.08182815459554, 29.56480875999173], [-95.08182827192432, 29.56481233923013], [-95.08182838207175, 29.564815918104376], [-95.08182847997436, 29.564819496357707], [-95.08182856056868, 29.56482307373337], [-95.08182861879123, 29.56482664997461], [-95.08182864957858, 29.56483022482466], [-95.08182864786724, 29.564833798026772], [-95.08182860860946, 29.564837369324984], [-95.08182853289411, 29.564840938774505], [-95.08182843723364, 29.564844507212655], [-95.08182834052532, 29.56484807559766], [-95.08182826166633, 29.564851644887764], [-95.08182821955394, 29.564855216041213], [-95.08182823308537, 29.564858790016228], [-95.08182832115789, 29.564862367771063], [-95.08182850266867, 29.564865950263943], [-95.08182879651503, 29.564869538453117], [-95.08182922159412, 29.564873133296814], [-95.0818297920294, 29.56487673551121], [-95.08183046983862, 29.564880343170305], [-95.08183118496565, 29.564883952721697], [-95.08183186688501, 29.564887560589202], [-95.08183244507121, 29.56489116319662], [-95.0818328489988, 29.564894756967757], [-95.0818330081423, 29.564898338326422], [-95.0818328519762, 29.564901903696416], [-95.08183230997507, 29.564905449501545], [-95.08183131161343, 29.56490897216562], [-95.08182978658554, 29.564912468143458], [-95.08182770548606, 29.56491593966094], [-95.08182512751613, 29.564919401446417], [-95.08182212346608, 29.56492286986349], [-95.08181876412623, 29.56492636127575], [-95.08181512028693, 29.56492989204679], [-95.0818112627385, 29.564933478540212], [-95.08180726227125, 29.564937137119603], [-95.08180318967555, 29.56494088414856], [-95.08179911574169, 29.564944735990675], [-95.08179511126002, 29.564948709009542], [-95.08179124095251, 29.56495281415071], [-95.08178751433995, 29.564957013074043], [-95.0817839114771, 29.564961241131076], [-95.08178041214235, 29.56496543342652], [-95.08177699611404, 29.564969525065095], [-95.08177364317048, 29.564973451151527], [-95.08177033309005, 29.564977146790515], [-95.08176704565109, 29.564980547086797], [-95.08176376063197, 29.564983587145072], [-95.08176045781099, 29.564986202070067], [-95.08175711704644, 29.564988327308097], [-95.08175372671279, 29.56498993471747], [-95.0817502911387, 29.5649910643702], [-95.08174681640673, 29.564991763837142], [-95.08174330859943, 29.564992080689144], [-95.08173977379934, 29.56499206249707], [-95.08173621808902, 29.564991756831763], [-95.081732647551, 29.564991211264086], [-95.08172906826783, 29.564990473364887], [-95.08172548632209, 29.564989590705014], [-95.08172190779628, 29.56498861085533], [-95.08171833826641, 29.564987583247284], [-95.0817147794352, 29.56498657153774], [-95.08171123121762, 29.564985645949978], [-95.08170769351898, 29.56498487674253], [-95.08170416624462, 29.564984334173936], [-95.08170064929985, 29.564984088502747], [-95.08169714258999, 29.564984209987507], [-95.08169364602037, 29.564984768886756], [-95.08169015949633, 29.564985835459044], [-95.08168668292316, 29.56498747996291], [-95.08168321619787, 29.564989771590305], [-95.08167975864504, 29.56499270664391], [-95.08167630865965, 29.564996163014094], [-95.08167286455141, 29.56500000774252], [-95.08166942463008, 29.565004107870852], [-95.08166598720534, 29.565008330440747], [-95.08166255058701, 29.565012542493882], [-95.08165911308478, 29.565016611071904], [-95.08165567300843, 29.565020403216486], [-95.08165222866765, 29.565023785969288], [-95.0816487783722, 29.56502662637197], [-95.08164532048347, 29.56502881169437], [-95.08164185369672, 29.565030360032587], [-95.08163837684008, 29.565031341534706], [-95.081634888742, 29.56503182648216], [-95.08163138823097, 29.56503188515636], [-95.08162787413545, 29.56503158783873], [-95.08162434528391, 29.565031004810706], [-95.08162080050482, 29.565030206353697], [-95.08161723862665, 29.565029262749135], [-95.08161365847785, 29.56502824427844], [-95.08161005898327, 29.56502722103299], [-95.08160644361999, 29.56502625412606], [-95.08160282229261, 29.565025391994403], [-95.08159920539117, 29.565024682117354], [-95.08159560330571, 29.56502417197424], [-95.0815920264263, 29.565023909044402], [-95.08158848514297, 29.56502394080716], [-95.08158498984577, 29.565024314741848], [-95.08158155092472, 29.5650250783278], [-95.08157817876993, 29.565026279044346], [-95.08157488377138, 29.565027964370817], [-95.08157167073625, 29.565030168412143], [-95.08156851378574, 29.56503285176168], [-95.08156537655368, 29.565035949889168], [-95.08156222266479, 29.565039398242554], [-95.08155901574376, 29.5650431322698], [-95.08155571941538, 29.56504708741887], [-95.08155229730436, 29.565051199137706], [-95.08154871303539, 29.565055402874275], [-95.08154493023324, 29.565059634076537], [-95.08154091252261, 29.56506382819244], [-95.08153662561179, 29.565067921660678], [-95.08153210697323, 29.565071885044183], [-95.08152748228805, 29.565075730849575], [-95.08152288265374, 29.565079474159], [-95.08151843916787, 29.565083130054592], [-95.08151428292794, 29.56508671361851], [-95.08151054503149, 29.565090239932882], [-95.08150735657601, 29.565093724079862], [-95.08150484865905, 29.565097181141592], [-95.08150315237813, 29.565100626200223], [-95.08150239883076, 29.565104074337885], [-95.08150268591389, 29.56510753824295], [-95.08150395596772, 29.56511101938805], [-95.08150610581262, 29.56511451596381], [-95.08150903226328, 29.56511802616046], [-95.0815126321343, 29.565121548168204], [-95.08151680224037, 29.56512508017727], [-95.08152143939616, 29.56512862037787], [-95.08152644041627, 29.56513216696023], [-95.0815317021154, 29.56513571811455], [-95.0815371213082, 29.565139272031068], [-95.08154259480935, 29.565142826899983], [-95.08154801943347, 29.56514638091153], [-95.08155329199522, 29.56514993225591], [-95.08155830930929, 29.565153479123353], [-95.08156296819028, 29.56515701970407], [-95.08156716545291, 29.565160552188285], [-95.0815707979118, 29.56516407476621], [-95.0815737623816, 29.56516758562806], [-95.08157595567697, 29.565171082964063], [-95.0815772746126, 29.565174564964423], [-95.0815776160031, 29.56517802981937]]}, "properties": {"name": "Rover Path"}}]}

server/json_databases/geojson/user_pins.json

@@ -1 +1 @@
-{"type": "FeatureCollection", "features": []}
+{"type": "FeatureCollection", "features": [{"type": "Feature", "properties": {"Name": "Jonah"}, "geometry": {"coordinates": [-95.08157400428185, 29.565196984797694], "type": "Point"}, "id": 222}]}

server/mapping.py

@@ -105,18 +105,18 @@ def dijkstra(graph, startLat, startLong, endLat, endLong):
     pq = [(0, start)]
     visited = set()
     distances[start] = 0
-    
+
     while pq:
         dist, node = heapq.heappop(pq)
-        
+
         if node == end:
             break 
-        
+
         if node in visited:
             continue
-        
+
         visited.add(node)
-        
+
         for neighbor, weight in graph[node].items():
             if distances[node] + weight < distances[neighbor]:
                 distances[neighbor] = distances[node] + weight
@@ -177,7 +177,7 @@ def index_to_letter(index):
             return "AA"
         else:
             return chr(ord('A') + 26 - index - 1)
-    
+
     width_per_box = 100 / 28
     height_per_box = 108 / 26
 
@@ -221,15 +221,15 @@ def convert_to_geojson_feature_collection(coordinates):
 def smooth_coordinates(coordinates):
     if len(coordinates) < 3:
         return coordinates  # Not enough points to smooth
-    
+
     latitudes = [coord[0] for coord in coordinates]
     longitudes = [coord[1] for coord in coordinates]
-    
+
     cs_lat = CubicSpline(range(len(latitudes)), latitudes)
     cs_lon = CubicSpline(range(len(longitudes)), longitudes)
-    
+
     xs = np.linspace(0, len(latitudes) - 1, len(latitudes) * 10)
     smoothed_lats = cs_lat(xs)
     smoothed_lons = cs_lon(xs)
-    
-    return list(zip(smoothed_lats, smoothed_lons))
+
+    return list(zip(smoothed_lats, smoothed_lons))

src/components/Map.js

@@ -130,13 +130,10 @@ const MapboxComponent = () => {
       type: "Feature",
       properties: {
         Name: name,
-        "marker-color": "#f4aeae",
-        "marker-size": "medium",
-        "marker-symbol": "circle"
       },
       geometry: {
-        type: "Point",
-        coordinates
+        coordinates,
+        type: "Point"
       },
       id: parseInt(id, 10)
     };