Skip to content

add show heatmap #2

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

Open
simon0628 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add show heatmap #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
87 changes: 48 additions & 39 deletions src/City.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,17 @@
import math
from pyqtree import Index
import logging
import numpy as np


class City(object):
def __init__(self, target_size):
super(City, self).__init__()
self.heatmap = HeatMap()
self.segments = list()
self.target_size = target_size

#self.extra_heatmap = np.zeros()

self.nodes = list()
self.node_id = 0
self.ways = dict()
Expand All @@ -35,28 +38,28 @@ def __init__(self, target_size):
))

def find_intersect(self, node):
return self.node_index.intersect((node.x-50, node.y-50, node.x+50, node.y+50))
return self.node_index.intersect((node.x - 10, node.y - 10, node.x + 10, node.y + 10))

def add_node(self, p):
# search for dup
near_node_ids = self.find_intersect(p)

if len(near_node_ids) > 0: # dup exists
if len(near_node_ids) > 0: # dup exists
# if the new node A is quite close to an existing node B, use B
return near_node_ids[0]
else:
# add a new node
self.nodes.append(CityNode(self.node_id, p.x, p.y))
self.node_index.insert(
self.node_id, (p.x-NODE_SNAP_DISTANCE, p.y-NODE_SNAP_DISTANCE, p.x+NODE_SNAP_DISTANCE, p.y+NODE_SNAP_DISTANCE))
self.node_id, (
p.x - NODE_SNAP_DISTANCE, p.y - NODE_SNAP_DISTANCE, p.x + NODE_SNAP_DISTANCE, p.y + NODE_SNAP_DISTANCE))
self.node_id = self.node_id + 1
logging.info("add new segment: id=%d, (%f, %f)" % (self.node_id-1, p.x, p.y))
return self.node_id - 1


def append_segment(self, segment):
segment.meta['start_id'] = self.add_node(segment.start)
segment.meta['end_id'] = self.add_node(segment.end)


if segment.meta['new_segment']:
segment.meta['id'] = self.road_id
Expand All @@ -65,38 +68,38 @@ def append_segment(self, segment):
segment.meta['nodes'].append(segment.meta['start_id'])
segment.meta['nodes'].append(segment.meta['end_id'])

self.ways[segment.meta['id']] = CityWay(segment.meta['id'], segment.meta['nodes'], segment.meta['highway'], segment.meta['length'])
self.ways[segment.meta['id']] = CityWay(segment.meta['id'], segment.meta['nodes'], segment.meta['highway'],
segment.meta['length'])
else:
segment.meta['nodes'].append(segment.meta['end_id'])

self.ways[segment.meta['id']].nodes_id.append(segment.meta['end_id'])
self.ways[segment.meta['id']].length += segment.meta['length']


# self.nodes[segment.meta['start_id']].r.append(segment.meta['id'])
# self.nodes[segment.meta['end_id']].r.append(segment.meta['id'])

self.segments.append(segment)
self.road_index.insert(segment, (segment.get_box()))
logging.info('append road, meta: ' +str(segment.meta) + ' road: ' + segment.to_string())
logging.info('append road, meta: ' + str(segment.meta) + ' road: ' + segment.to_string())

# operating only meta here
def gen_segment(self, start, delay, meta, dir, new_segment = True):
def gen_segment(self, start, delay, meta, dir, new_segment=True):
meta = meta.copy()

length = 0
if meta['highway']:
length = HIGHWAY_SEGMENT_LENGTH + rand_in_limit(HIGHWAY_SEGMENT_LENGTH_OFFSET_LIMIT)
else:
length = STREET_SEGMENT_LENGTH + rand_in_limit(STREET_SEGMENT_LENGTH_OFFSET_LIMIT)

end = Point(
start.x + length*math.sin(math.radians(dir)),
start.y + length*math.cos(math.radians(dir))
start.x + length * math.sin(math.radians(dir)),
start.y + length * math.cos(math.radians(dir))
)

near_node_ids = self.find_intersect(end)
if len(near_node_ids) > 0: # dup exists
if len(near_node_ids) > 0: # dup exists
# if the new node A is quite close to an existing node B, use B
end = self.nodes[near_node_ids[0]]

Expand All @@ -106,7 +109,7 @@ def gen_segment(self, start, delay, meta, dir, new_segment = True):
meta['width'] = HIGHWAY_SEGMENT_WIDTH
else:
meta['width'] = STREET_SEGMENT_WIDTH + \
rand_in_limit(STREET_SEGMENT_WIDTH_OFFSET_LIMIT)
rand_in_limit(STREET_SEGMENT_WIDTH_OFFSET_LIMIT)
meta['length'] = length
meta['new_segment'] = True

Expand All @@ -115,7 +118,7 @@ def gen_segment(self, start, delay, meta, dir, new_segment = True):
meta['new_segment'] = False

res = Segment(start, end, delay, meta)
logging.debug('gen new road, meta: ' +str(meta) + ' road: ' + res.to_string())
logging.debug('gen new road, meta: ' + str(meta) + ' road: ' + res.to_string())

return res

Expand All @@ -125,7 +128,7 @@ def gen_segment_follow(self, previous_segment, dir):
STRENCH_TIME_DELAY_HIGHWAY if previous_segment.meta['highway'] else STRENCH_TIME_DELAY_STREET,
previous_segment.meta,
dir,
new_segment = False
new_segment=False
)

def gen_segment_branch(self, previous_segment, dir):
Expand All @@ -138,23 +141,23 @@ def gen_segment_branch(self, previous_segment, dir):
BRANCH_TIME_DELAY_HIGHWAY,
new_meta,
dir,
new_segment = True
new_segment=True
)
else:
return self.gen_segment(
previous_segment.end,
BRANCH_TIME_DELAY_HIGHWAY,
new_meta,
dir,
new_segment = True
new_segment=True
)
else:
return self.gen_segment(
previous_segment.end,
BRANCH_TIME_DELAY_STREET,
new_meta,
dir,
new_segment = True
new_segment=True
)

def globalGoals(self, previous_segment):
Expand Down Expand Up @@ -188,22 +191,24 @@ def globalGoals(self, previous_segment):
if max_heat > HIGHWAY_BRANCH_HEAT_THRESHOLD:
if rand_hit_thershold(HIGHWAY_BRANCH_RIGHT_PROBABILITY):
left_highway_branch = self.gen_segment_branch(
previous_segment, previous_segment.dir() - 90 + rand_in_limit(HIGHWAY_BRANCH_DIRECTION_OFFSET_LIMIT))
previous_segment,
previous_segment.dir() - 90 + rand_in_limit(HIGHWAY_BRANCH_DIRECTION_OFFSET_LIMIT))
proposed_segments.append(left_highway_branch)
logging.info("---gen [highway] left branch: " + left_highway_branch.to_string())

if rand_hit_thershold(HIGHWAY_BRANCH_RIGHT_PROBABILITY):
right_highway_branch = self.gen_segment_branch(
previous_segment, previous_segment.dir() + 90 + rand_in_limit(HIGHWAY_BRANCH_DIRECTION_OFFSET_LIMIT))
previous_segment,
previous_segment.dir() + 90 + rand_in_limit(HIGHWAY_BRANCH_DIRECTION_OFFSET_LIMIT))
proposed_segments.append(right_highway_branch)
logging.info("---gen [highway] right branch: " + right_highway_branch.to_string())

else:
if rand_hit_thershold(max_heat*3):
if rand_hit_thershold(max_heat * 3):
proposed_segments.append(curve_follow_segment)
logging.info("---gen [street] follow branch: " + curve_follow_segment.to_string())

if rand_hit_thershold(straight_heat*3):
if rand_hit_thershold(straight_heat * 3):
if rand_hit_thershold(STREET_BRANCH_LEFT_PROBABILITY):
left_branch = self.gen_segment_branch(previous_segment, previous_segment.dir(
) - 90 + rand_in_limit(STREET_BRANCH_DIRECTION_OFFSET_LIMIT))
Expand Down Expand Up @@ -231,19 +236,25 @@ def localConstraints(self, segment, segments):
for other in matchSegments:
degree = min_intersect_degree(other.dir(), segment.dir())

if segment.start.equal(other.start) or segment.start.equal(other.end):
if on_segment(segment.end, other.start, other.end) :
return False
# 1. intersection check
cross = line_cross([segment.start, segment.end], [
other.start, other.end])
other.start, other.end])
if segment.start.equal(other.start) and cross < MINIMUM_INTERSECTION_DEVIATION:
logging.info("segment is checked out due to cross in small angel, segment id: " + str(
segment.meta['id']) + "other id: " + str(other.meta['id']))
return False

if cross != False:
if not cross.equal(segment.start) and not cross.equal(segment.end):
# cross other line with small angle
if degree < MINIMUM_INTERSECTION_DEVIATION:
logging.info("segment is checked out due to cross in small angel, segment id: " + str(
segment.meta['id']) + "other id: " + str(other.meta['id']))
return False

cross_id = self.add_node(cross)
logging.info("segment is snapped, segment id: " + str(segment.meta['id']) + " other id: " + str(
other.meta['id']) + " cross id: " + str(cross_id))
segment.end = cross
segment.meta['snapped'] = True
# TODO: where should it be inserted
Expand Down Expand Up @@ -276,7 +287,7 @@ def generate(self):

while len(priority_queue) > 0 and len(self.segments) < self.target_size:

print('\r %d / %d' % (len(self.segments)+1, self.target_size ), end='')
print('\r %d / %d' % (len(self.segments) + 1, self.target_size), end='')
# pop smallest road(ti, ri, qi) from Q
min_t = None
min_index = 0
Expand Down Expand Up @@ -313,33 +324,31 @@ def post_process(self):
x1 = self.nodes[way_value.nodes_id[-1]].x
y0 = self.nodes[way_value.nodes_id[0]].y
y1 = self.nodes[way_value.nodes_id[-1]].y
if math.fabs(y1-y0) > math.fabs(x1-x0):
if math.fabs(y1 - y0) > math.fabs(x1 - x0):
self.ways[way_key].nodes_id = sorted(way_value.nodes_id, key=lambda t: self.nodes[t].y)
else:
self.ways[way_key].nodes_id = sorted(way_value.nodes_id, key=lambda t: self.nodes[t].x)

if not way_value.is_highway:
if way_value.length * 1.0/ max_length < 0.33:
if way_value.length * 1.0 / max_length < 0.33:
width = 1

elif way_value.length * 1.0/max_length < 0.66:
elif way_value.length * 1.0 / max_length < 0.66:
width = 2

else:
width = 3
else:
width = HIGHWAY_SEGMENT_WIDTH
self.ways[way_key].set_width(width)


class HeatMap(object):
def road_heat(self, road):
return (self.population(road.start.x, road.start.y) + self.population(road.end.x, road.end.y))/2
return (self.population(road.start.x, road.start.y) + self.population(road.end.x, road.end.y)) / 2

def population(self, x, y):
value1 = (noise.snoise2(x/10000, y/10000) + 1) / 2
value2 = (noise.snoise2(x/20000 + 500, y/20000 + 500) + 1) / 2
value3 = (noise.snoise2(x/20000 + 1000, y/20000 + 1000) + 1) / 2
value1 = (noise.snoise2(x / 10000, y / 10000) + 1) / 2
value2 = (noise.snoise2(x / 20000 + 500, y / 20000 + 500) + 1) / 2
value3 = (noise.snoise2(x / 20000 + 1000, y / 20000 + 1000) + 1) / 2
return pow((value1 * value2 + value3) / 2, 2)


2 changes: 1 addition & 1 deletion src/Constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
# time delay
BRANCH_TIME_DELAY_HIGHWAY = 5
BRANCH_TIME_DELAY_STREET = 1
STRENCH_TIME_DELAY_HIGHWAY = 4
STRENCH_TIME_DELAY_HIGHWAY = 5
STRENCH_TIME_DELAY_STREET = 0

# local constrains
Expand Down
12 changes: 11 additions & 1 deletion src/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
import logging
from external.OSMGenerator import *
import argparse
import numpy as np
import matplotlib.pyplot as plt

RUNTIME_DIR = "../runtime/"
LOG_DIR = RUNTIME_DIR+"log/"
Expand Down Expand Up @@ -29,14 +31,22 @@ def init_logging(debug = False):


def draw(filename, debug = False):

u = np.linspace(-20000, 20000, 1000)
x, y = np.meshgrid(u, u)
f = np.vectorize(city.heatmap.population)
z = f(x, y)
# z = heatmap.population(x, y)
plt.contourf(x, y, z)

for segment in city.segments:
width = city.ways[segment.meta['id']].get_width()
plt.plot(
[segment.start.x,
segment.end.x],
[segment.start.y,
segment.end.y],
color='k' if segment.meta['highway'] else 'b',
color='k',
linewidth=width
)

Expand Down