Skip to content

Implementation of the second-pass clustering algorithm to prevent ann… #102

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
deem0n wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Implementation of the second-pass clustering algorithm to prevent ann… #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df08c35
Implementation of the second-pass clustering algorithm to prevent ann…
deem0n Aug 7, 2015
dd0674d
Prevent a strong reference cycle + allow graceful cancel of the clust…
deem0n Sep 3, 2015
731bd45
Obvious changes for weak self in blocks and typos on setters
deem0n Oct 23, 2015
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
35 changes: 29 additions & 6 deletions ...sterController Example iOS/CCHMapClusterController Example iOS/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="5056" systemVersion="13D65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="Ol5-WO-7Ie">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="Ol5-WO-7Ie">
<dependencies>
<deployment defaultVersion="1536" identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
</dependencies>
<scenes>
<!--Map View Controller - Map Clustering-->
<!--Map Clustering-->
<scene sceneID="ufC-wZ-h7g">
<objects>
<viewController id="vXZ-lx-hvc" customClass="MapViewController" sceneMemberID="viewController">
Expand All @@ -19,7 +18,6 @@
<subviews>
<mapView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" mapType="standard" translatesAutoresizingMaskIntoConstraints="NO" id="MFm-39-WZl">
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<connections>
<outlet property="delegate" destination="vXZ-lx-hvc" id="2Vf-Qw-6UR"/>
</connections>
Expand Down Expand Up @@ -53,7 +51,7 @@
</objects>
<point key="canvasLocation" x="700" y="138"/>
</scene>
<!--Settings View Controller - Settings-->
<!--Settings-->
<scene sceneID="qKr-R8-Ry7">
<objects>
<tableViewController id="64Q-mX-0IY" customClass="SettingsViewController" sceneMemberID="viewController">
Expand Down Expand Up @@ -105,6 +103,30 @@
</subviews>
</tableViewCellContentView>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" textLabel="wiS-Ou-gXo" detailTextLabel="XC8-ox-QaD" style="IBUITableViewCellStyleSubtitle" id="pjY-VB-MvY">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="pjY-VB-MvY" id="f70-j0-OwF">
<rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Approx. annotation radius" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" id="wiS-Ou-gXo">
<rect key="frame" x="15" y="3" width="67" height="22"/>
<autoresizingMask key="autoresizingMask"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Subtitle" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="XC8-ox-QaD">
<rect key="frame" x="15" y="25" width="43" height="15"/>
<autoresizingMask key="autoresizingMask"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</tableViewCellContentView>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" textLabel="Cq0-Ni-J0o" detailTextLabel="Faa-Xa-4qP" style="IBUITableViewCellStyleSubtitle" id="zKF-Om-nF7">
<rect key="frame" x="0.0" y="207" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
Expand Down Expand Up @@ -312,6 +334,7 @@
</barButtonItem>
</navigationItem>
<connections>
<outlet property="approximatedAnnotationRadiusTableViewCell" destination="pjY-VB-MvY" id="bYA-zX-Mcw"/>
<outlet property="cellSizeTableViewCell" destination="pep-Q6-TyH" id="y6B-bZ-64z"/>
<outlet property="debuggingEnabledTableViewCell" destination="N8g-B4-cEC" id="ivT-Ug-TAQ"/>
<outlet property="groupingEnabledTableViewCell" destination="oVK-oY-r6I" id="vRM-kC-lv2"/>
Expand Down
15 changes: 15 additions & 0 deletions ... iOS/CCHMapClusterController Example iOS/Images.xcassets/AppIcon.appiconset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,30 @@
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "3x"
}
],
"info" : {
Expand Down
12 changes: 8 additions & 4 deletions ...S/CCHMapClusterController Example iOS/Images.xcassets/CircleBlue21.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "circle21.png"
"filename" : "circle21.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "circle21@2x.png"
"filename" : "circle21@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down
12 changes: 8 additions & 4 deletions ...S/CCHMapClusterController Example iOS/Images.xcassets/CircleBlue24.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "circle24.png"
"filename" : "circle24.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "circle24@2x.png"
"filename" : "circle24@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down
12 changes: 8 additions & 4 deletions ...S/CCHMapClusterController Example iOS/Images.xcassets/CircleBlue25.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "circle25.png"
"filename" : "circle25.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "circle25@2x.png"
"filename" : "circle25@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down
12 changes: 8 additions & 4 deletions ...S/CCHMapClusterController Example iOS/Images.xcassets/CircleBlue28.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "circle28.png"
"filename" : "circle28.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "circle28@2x.png"
"filename" : "circle28@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down
12 changes: 8 additions & 4 deletions ...S/CCHMapClusterController Example iOS/Images.xcassets/CircleBlue31.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "circle31.png"
"filename" : "circle31.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "circle31@2x.png"
"filename" : "circle31@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down
12 changes: 8 additions & 4 deletions ...S/CCHMapClusterController Example iOS/Images.xcassets/CircleBlue34.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "circle34.png"
"filename" : "circle34.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "circle34@2x.png"
"filename" : "circle34@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down
12 changes: 8 additions & 4 deletions ...S/CCHMapClusterController Example iOS/Images.xcassets/CircleBlue36.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "circle36.png"
"filename" : "circle36.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "circle36@2x.png"
"filename" : "circle36@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down
12 changes: 8 additions & 4 deletions ...S/CCHMapClusterController Example iOS/Images.xcassets/CircleBlue38.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "circle38.png"
"filename" : "circle38.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "circle38@2x.png"
"filename" : "circle38@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down
12 changes: 8 additions & 4 deletions ...S/CCHMapClusterController Example iOS/Images.xcassets/CircleBlue39.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "circle39.png"
"filename" : "circle39.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "circle39@2x.png"
"filename" : "circle39@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down
12 changes: 8 additions & 4 deletions ...OS/CCHMapClusterController Example iOS/Images.xcassets/CircleRed21.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "circle21.png"
"filename" : "circle21.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "circle21@2x.png"
"filename" : "circle21@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down
12 changes: 8 additions & 4 deletions ...OS/CCHMapClusterController Example iOS/Images.xcassets/CircleRed24.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "circle24.png"
"filename" : "circle24.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "circle24@2x.png"
"filename" : "circle24@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down
12 changes: 8 additions & 4 deletions ...OS/CCHMapClusterController Example iOS/Images.xcassets/CircleRed25.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "circle25.png"
"filename" : "circle25.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "circle25@2x.png"
"filename" : "circle25@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down
12 changes: 8 additions & 4 deletions ...OS/CCHMapClusterController Example iOS/Images.xcassets/CircleRed28.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "circle28.png"
"filename" : "circle28.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "circle28@2x.png"
"filename" : "circle28@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down
Loading